Merge branch 'dev' into prod

.github/workflows/deploy-dev.yaml

@@ -4,7 +4,7 @@ name: Deploy to dev
 on:
   workflow_dispatch:
   push:
-    branch:
+    branches:
       - dev
 
 permissions:
@@ -26,7 +26,7 @@ jobs:
 
       - name: Get version
         id: version
-        run: echo VERSION=$(git describe --exact-match --tags | sed 's/^v//') >> $GITHUB_OUTPUT
+        run: make version >> $GITHUB_OUTPUT
 
       - name: Install deps
         run: npm install

.github/workflows/deploy-prod.yaml

@@ -4,7 +4,7 @@ name: Deploy to prod
 on:
   workflow_dispatch:
   push:
-    branch:
+    branches:
       - prod
 
 permissions:
@@ -26,7 +26,7 @@ jobs:
 
       - name: Get version
         id: version
-        run: echo VERSION=0.0.0 >> $GITHUB_OUTPUT
+        run: make version >> $GITHUB_OUTPUT
 
       - name: Install deps
         run: npm install

Makefile

@@ -1,8 +1,11 @@
 
-VERSION=0.1.0
+VERSION=0.3.1
 
 all: service-package container
 
+version:
+	@echo VERSION=${VERSION}
+
 ui:
 	npm run build
 	rm -rf config-ui/config_ui/ui/

config-ui/config_ui/api.py

@@ -84,7 +84,7 @@ async def everything(self, request):
             raise web.HTTPInternalServerError()
 
     def process(
-            self, config, version="0.11.20", platform="docker-compose",
+            self, config, version="0.12.5", platform="docker-compose",
     ):
 
         config = config.encode("utf-8")

pulumi/index.ts

@@ -90,7 +90,7 @@ const image = new local.Command(
 const svcAccount = new gcp.serviceaccount.Account(
     "service-account",
     {
-	accountId: "config-ui",
+	accountId: "config-ui-" + environment,
 	displayName: "Config UI",
 	description: "Config UI",
     },
@@ -118,7 +118,7 @@ const vertexAiUserMember = new gcp.projects.IAMMember(
 const service = new gcp.cloudrun.Service(
     "service",
     {
-	name: "config-ui",
+	name: "config-ui-" + environment,
 	location: cloudRunRegion,
 	template: {
 	    metadata: {

src/App.scss

@@ -1,5 +1,12 @@
 #root {
-  margin: 0 auto;
-  padding: 1rem;
+    margin: 0 auto;
+    padding: 1rem;
+    height: 100vh;
+}
+
+body {
+    width: 100vh;
+    height: 100vh;
+    margin: 0;
 }
 

src/simple-editor/Banner.tsx

@@ -0,0 +1,29 @@
+
+import React from 'react';
+
+import { Typography, Box, Stack } from '@mui/material';
+
+const Banner: React.FC = () => {
+
+    return (
+
+        <Stack
+            alignItems="center"
+            direction="row"
+            gap={2}
+            sx={{ mb: 3 }}
+        >
+                <Box>
+                    <img src="/tg.svg" alt="Trustgraph logo"
+                        height="45"/>
+                </Box>
+                <Typography variant="h4" component="h1">
+                    TrustGraph configuration creator
+                </Typography>
+        </Stack>
+    );
+
+}
+
+export default Banner;
+