Feat/11502 bpmn palette icons

.github/labeler.yml

@@ -44,6 +44,9 @@ area/text-editor:
 area/ui-editor:
   - 'frontend/packages/ux-editor/**/*'
 
+area/studio-root:
+  - 'frontend/studio-root/**/*'
+
 ## Other labels
 kind/dependencies:
   - 'backend/packagegroups/NuGet.props'

.github/workflows/designer-dotnet-test.yaml

@@ -17,7 +17,7 @@ jobs:
   analyze:
     strategy:
       matrix:
-        os: [ubuntu-latest,windows-latest,macos-latest] #windows-latest and macos-latest excluded temporarily
+        os: [ubuntu-latest,windows-latest,macos-latest]
     name: Run dotnet build and test
     runs-on: ${{ matrix.os}}
     env:
@@ -36,4 +36,11 @@ jobs:
           dotnet build backend/Designer.sln -v m
       - name: Test
         run: |
-          dotnet test backend/Designer.sln --filter FullyQualifiedName~AppDevelopmentController --no-build; dotnet test backend/Designer.sln --filter FullyQualifiedName~PreviewController --no-build; dotnet test backend/Designer.sln --filter "(Category!=GiteaIntegrationTest)&(FullyQualifiedName!~AppDevelopmentController)&(FullyQualifiedName!~PreviewController)" -v m --no-build
+          dotnet test backend/Designer.sln --filter FullyQualifiedName~AppDevelopmentController --no-build;
+          dotnet test backend/Designer.sln --filter FullyQualifiedName~PolicyControllerTests --no-build;
+          dotnet test backend/Designer.sln --filter FullyQualifiedName~PreviewController --no-build;
+          dotnet test backend/Designer.sln --filter FullyQualifiedName~DataModelsController --no-build;
+          dotnet test backend/Designer.sln --filter FullyQualifiedName~ResourceAdminController --no-build;
+          dotnet test backend/Designer.sln --filter FullyQualifiedName~TextController --no-build;
+          dotnet test backend/Designer.sln --filter "(Category!=GiteaIntegrationTest)&(FullyQualifiedName~RepositoryController)" --no-build;
+          dotnet test backend/Designer.sln --filter "(Category!=GiteaIntegrationTest)&(FullyQualifiedName!~AppDevelopmentController)&(FullyQualifiedName!~PreviewController)&(FullyQualifiedName!~PolicyControllerTests)&(FullyQualifiedName!~DataModelsController)&(FullyQualifiedName!~ResourceAdminController)&(FullyQualifiedName!~TextController)&(FullyQualifiedName!~RepositoryController)" -v m --no-build

Dockerfile

@@ -23,7 +23,7 @@ FROM mcr.microsoft.com/dotnet/aspnet:6.0-alpine AS final
 EXPOSE 80
 WORKDIR /app
 ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
-    DOTNET_RUNNING_IN_CONTAINER=true
+  DOTNET_RUNNING_IN_CONTAINER=true
 RUN apk add --no-cache icu-libs krb5-libs libgcc libintl libssl1.1 libstdc++ zlib
 
 COPY --from=generate-studio-backend /app_output .
@@ -32,6 +32,7 @@ COPY --from=generate-studio-frontend /build/frontend/dist/app-preview ./wwwroot/
 COPY --from=generate-studio-frontend /build/frontend/dist/dashboard ./wwwroot/designer/frontend/dashboard
 COPY --from=generate-studio-frontend /build/frontend/dist/resourceadm ./wwwroot/designer/frontend/resourceadm
 COPY --from=generate-studio-frontend /build/frontend/dist/language ./wwwroot/designer/frontend/lang
+COPY --from=generate-studio-frontend /build/frontend/dist/studio-root ./wwwroot/designer/frontend/studio-root
 
 ## Copying app template
 COPY --from=generate-studio-backend /app_template ./Templates/AspNet

README.md

@@ -91,6 +91,7 @@ is configured with the following variables.
 DEVELOP_BACKEND=0
 DEVELOP_DASHBOARD=0
 DEVELOP_APP_DEVELOPMENT=0
+DEVELOP_STUDIO_ROOT=0
 ```
 
 ## Developing Backend

backend/src/Designer/Controllers/HomeController.cs

@@ -80,17 +80,24 @@ public async Task<ActionResult> StartPage()
             return LocalRedirect("/dashboard");
         }
 
+        [Route("/{*AllValues:regex(^(?!designer).*$)}")]
+        public IActionResult Index()
+        {
+            ViewBag.InstrumentationKey = _applicationInsightsSettings.InstrumentationKey;
+            return View();
+        }
+
         /// <summary>
         /// The default action presenting a list of available apps when the user is logged in
         /// </summary>
         /// <returns>The front page</returns>
         [Route("/[controller]/[action]")]
         [Authorize]
         [Route("/dashboard/{*AllValues}", Name = "DefaultLoggedIn")]
-        public ActionResult Index()
+        public ActionResult Dashboard()
         {
             ViewBag.InstrumentationKey = _applicationInsightsSettings.InstrumentationKey;
-            return View();
+            return View("Dashboard");
         }
 
         /// <summary>

backend/src/Designer/Views/Home/Dashboard.cshtml

@@ -0,0 +1,17 @@
+@{ViewBag.Title = "Altinn Studio";}
+
+<html lang="no">
+<head>
+  <title>@ViewBag.Title</title>
+  <link rel="shortcut icon" href="/designer/img/favicon.ico"/>
+  <script type="text/javascript">
+    var instrumentationKey = "@ViewBag.InstrumentationKey"
+    window.instrumentationKey = instrumentationKey;
+  </script>
+</head>
+<body>
+<div id="root" class="media-body flex-column d-flex"></div>
+<link  href="/designer/frontend/dashboard/dashboard.css" rel="stylesheet"      asp-append-version="true"/>
+<script src="/designer/frontend/dashboard/dashboard.js" type="text/javascript" asp-append-version="true"></script>
+</body>
+</html>

backend/src/Designer/Views/Home/Index.cshtml

@@ -1,17 +1,25 @@
-@{ViewBag.Title = "Altinn Studio";}
+@{
+    ViewBag.Title = "Altinn Studio";
+}
 
 <html lang="no">
+
 <head>
-  <title>@ViewBag.Title</title>
-  <link rel="shortcut icon" href="/designer/img/favicon.ico"/>
-  <script type="text/javascript">
-    var instrumentationKey = "@ViewBag.InstrumentationKey"
-    window.instrumentationKey = instrumentationKey;
-  </script>
+    <title>@ViewBag.Title</title>
+    <link href="https://altinncdn.no/fonts/roboto/latin/roboto.css" rel="stylesheet">
+    <link href="https://altinncdn.no/fonts/inter/inter.css" rel="stylesheet">
+    <link rel="shortcut icon" href="/designer/img/favicon.ico" />
+    <script type="text/javascript">
+        var instrumentationKey = "@ViewBag.InstrumentationKey"
+        window.instrumentationKey = instrumentationKey;
+    </script>
 </head>
+
 <body>
-<div id="root" class="media-body flex-column d-flex"></div>
-<link  href="/designer/frontend/dashboard/dashboard.css" rel="stylesheet"      asp-append-version="true"/>
-<script src="/designer/frontend/dashboard/dashboard.js" type="text/javascript" asp-append-version="true"></script>
+    <div id="root" class="media-body flex-column d-flex"></div>
+    <link href="/designer/frontend/studio-root/studio-root.css" rel="stylesheet" asp-append-version="true" />
+    <script src="/designer/frontend/studio-root/studio-root.js" type="text/javascript"
+        asp-append-version="true"></script>
 </body>
+
 </html>

development/README.md

@@ -21,6 +21,7 @@ DEVELOP_APP_DEVELOPMENT=0
 DEVELOP_BACKEND=0
 DEVELOP_DASHBOARD=0
 DEVELOP_PREVIEW=0
+DEVELOP_STUDIO_ROOT=0
 GITEA_ADMIN_PASS=a_password
 GITEA_ADMIN_USER=angiteaadminuser
 GITEA_ORG_USER=ttd

development/load-balancer/nginx.conf.conf

@@ -36,6 +36,7 @@ http {
 		set $dev_app_preview $DEVELOP_PREVIEW;
 		set $dev_backend $DEVELOP_BACKEND;
 		set $dev_dashboard $DEVELOP_DASHBOARD;
+		set $dev_studio_root $DEVELOP_STUDIO_ROOT;
 
 		server_name studio.localhost;
 
@@ -106,6 +107,20 @@ http {
 			}
 		}
 
+		location ^~ /designer/frontend/studio-root/ {
+			proxy_redirect off;
+			proxy_set_header Host $host;
+			if ($dev_studio_root) {
+				add_header X-Dashboard-Source webpackDash;
+				rewrite /designer/frontend/studio-root/(.*) /$1 break;
+				proxy_pass http://host.docker.internal:2002;
+			}
+			if ($dev_studio_root != 1) {
+				add_header X-Dashboard-Source dockerDash;
+				proxy_pass http://studio-designer:6000;
+			}
+		}
+
     location ^~ /previewHub {
       proxy_http_version 1.1;
       proxy_set_header Upgrade $http_upgrade;

development/utils/ensure-dot-env.js

@@ -4,7 +4,7 @@ const os = require('os');
 const getCommit = require('./git-commit-hash');
 const randomPass = () =>
   [Math.random().toString(36).substring(2, 5), Math.random().toString(36).substring(2, 5)].join(
-    'DIG@'
+    'DIG@',
   );
 
 const defaultEnvVars = {
@@ -14,6 +14,7 @@ const defaultEnvVars = {
   DEVELOP_BACKEND: 0,
   DEVELOP_DASHBOARD: 0,
   DEVELOP_PREVIEW: 0,
+  DEVELOP_STUDIO_ROOT: 0,
   GITEA_ADMIN_PASS: randomPass(),
   GITEA_ADMIN_USER: 'localgiteaadmin',
   GITEA_CYPRESS_USER: 'cypress_testuser',

docker-compose.yml

@@ -1,4 +1,4 @@
-version: "3.8"
+version: '3.8'
 
 volumes:
   designer-git-data:
@@ -15,7 +15,7 @@ services:
     build:
       context: ./development/azure-devops-mock
     ports:
-      - "6161:6161"
+      - '6161:6161'
     environment:
       - DESIGNER_HOST=studio-loadbalancer
 
@@ -24,13 +24,14 @@ services:
     container_name: studio-loadbalancer
     restart: always
     ports:
-      - "80:80"
+      - '80:80'
     environment:
       - DEVELOP_APP_DEVELOPMENT=${DEVELOP_APP_DEVELOPMENT:-0}
       - DEVELOP_RESOURCE_ADMIN=${DEVELOP_RESOURCE_ADMIN:-0}
       - DEVELOP_BACKEND=${DEVELOP_BACKEND:-0}
       - DEVELOP_DASHBOARD=${DEVELOP_DASHBOARD:-0}
       - DEVELOP_PREVIEW=${DEVELOP_PREVIEW:-0}
+      - DEVELOP_STUDIO_ROOT=${DEVELOP_STUDIO_ROOT:-0}
       - NGINX_ENVSUBST_OUTPUT_DIR=/etc/nginx/
       - NGINX_ENVSUBST_TEMPLATE_SUFFIX=.conf
       - NGINX_HOST=localhost
@@ -39,7 +40,7 @@ services:
     depends_on:
       - studio_repositories
     extra_hosts:
-      - "host.docker.internal:host-gateway"
+      - 'host.docker.internal:host-gateway'
     volumes:
       - ./frontend/language/src:/www-root/designer/frontend/lang:ro
       - ./development/load-balancer:/etc/nginx/templates/:ro
@@ -50,8 +51,8 @@ services:
     image: designer:${COMMIT:-latest}
     restart: always
     volumes:
-      - "designer-git-data:/AltinnCore/Repos"
-      - "keys:/mnt/keys"
+      - 'designer-git-data:/AltinnCore/Repos'
+      - 'keys:/mnt/keys'
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
       - ASPNETCORE_URLS=http://+:6000
@@ -77,22 +78,22 @@ services:
       - TestdataRepositorySettings:RepositoryLocation=/Testdata
       - Integrations:AzureDevOpsSettings:BaseUri=http://studio-azure-mock:6161/_apis/
     ports:
-      - "6000:6000"
+      - '6000:6000'
     depends_on:
       - studio_repositories
     build:
       context: .
     extra_hosts:
-      - "host.docker.internal:host-gateway"
+      - 'host.docker.internal:host-gateway'
 
   studio_repositories:
     container_name: studio-repositories
     image: repositories:latest
     restart: always
     volumes:
-      - "gitea-git-data:/var/lib/gitea/git"
-      - "gitea-avatars-data:/var/lib/gitea/avatars"
-      - "gitea-attachments-data:/var/lib/gitea/attachments"
+      - 'gitea-git-data:/var/lib/gitea/git'
+      - 'gitea-avatars-data:/var/lib/gitea/avatars'
+      - 'gitea-attachments-data:/var/lib/gitea/attachments'
     environment:
       - GITEA____RUN_MODE=prod
       - GITEA__database__DB_TYPE=postgres
@@ -116,12 +117,12 @@ services:
       - USER_GID=1000
       - USER_UID=1000
     ports:
-      - "3000:3000"
-      - "222:22"
+      - '3000:3000'
+      - '222:22'
     build:
       context: ./gitea/
     extra_hosts:
-      - "host.docker.internal:host-gateway"
+      - 'host.docker.internal:host-gateway'
 
   studio_db:
     container_name: studio-db
@@ -132,7 +133,7 @@ services:
       POSTGRES_USER: designer_admin
       POSTGRES_DB: designerdb
     ports:
-      - "5432:5432"
+      - '5432:5432'
     volumes:
       - ./development/db/init.sql:/docker-entrypoint-initdb.d/init.sql
       - ./development/db/data.sql:/data.sql