From 4a1eb465abad4c96b2e35bb0ec51d54c306f0bc9 Mon Sep 17 00:00:00 2001
From: Denis Arh <denis.arh@gmail.com>
Date: Thu, 18 Mar 2021 09:11:42 +0100
Subject: [PATCH] Cleanup webapp (dev & serving), add workflow

---
 Makefile        | 6 +++++-
 app/servers.go  | 1 +
 webapp/Makefile | 6 +++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 114d89b5a..99fccd811 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: pack build help qa critic vet codegen provision docs build auth
+.PHONY: pack build help qa critic vet codegen provision docs build auth webapp
 
 include Makefile.inc
 
@@ -142,6 +142,10 @@ clean.codegen:
 provision:
 	$(MAKE) --directory=provision clean all
 
+webapp:
+	$(MAKE) --directory=webapp install
+
+
 #######################################################################################################################
 # Quality Assurance
 
diff --git a/app/servers.go b/app/servers.go
index 14b046040..0a5e52d1c 100644
--- a/app/servers.go
+++ b/app/servers.go
@@ -135,6 +135,7 @@ func (app *CortezaApp) mountHttpRoutes(r chi.Router) {
 			"client web applications enabled",
 			zap.String("baseUrl", app.Opt.HTTPServer.WebappBaseUrl),
 			zap.String("baseDir", app.Opt.HTTPServer.WebappBaseDir),
+			zap.Strings("apps", strings.Split(app.Opt.HTTPServer.WebappList, ",")),
 		)
 	} else {
 		app.Log.Info("client web applications disabled")
diff --git a/webapp/Makefile b/webapp/Makefile
index 2f52227f9..421ac9ce6 100644
--- a/webapp/Makefile
+++ b/webapp/Makefile
@@ -3,9 +3,9 @@ WGET_FLAGS   ?= -q
 TAR          ?= tar
 TAR_FLAGS    ?= -xzmok
 RELEASE_PAGE ?= https://releases.cortezaproject.org/files
-APPS         ?= auth admin compose
+APPS         ?= admin compose workflow
 ALL_APPS     ?= $(APPS) one
-VERSION      ?= unstable
+VERSION      ?= 2021.3.0-rc.1
 PACKAGES      = $(addprefix corteza-webapp-,$(addsuffix -$(VERSION).tar.gz,$(ALL_APPS)))
 
 all: install
@@ -14,9 +14,9 @@ install: $(PACKAGES)
 	rm -rf $(addprefix public/,$(APPS))
 	mkdir -p $(addprefix public/,$(APPS))
 	$(TAR) $(TAR_FLAGS) -f corteza-webapp-one-$(VERSION).tar.gz -C public
-	$(TAR) $(TAR_FLAGS) -f corteza-webapp-auth-$(VERSION).tar.gz -C public/auth
 	$(TAR) $(TAR_FLAGS) -f corteza-webapp-admin-$(VERSION).tar.gz -C public/admin
 	$(TAR) $(TAR_FLAGS) -f corteza-webapp-compose-$(VERSION).tar.gz -C public/compose
+	$(TAR) $(TAR_FLAGS) -f corteza-webapp-workflow-$(VERSION).tar.gz -C public/workflow
 
 download: $(PACKAGES)