Merge pull request #104 from openslice/develop

Merging develop with master for 2023-Q4 release

.github/workflows/build-and-publish.yaml

@@ -0,0 +1,33 @@
+name: Build and Publish
+
+on:
+  push:
+    branches: [master, develop]
+  pull_request:
+
+jobs:
+  build-and-push-docker-image:
+    name: Build Docker image and push to repositories
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build image and push to Docker Hub and GitHub Container Registry
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          tags: |
+            openslice/io.openslice.tmf.web:${{ github.ref == 'refs/heads/master' && 'latest' || github.ref == 'refs/heads/develop' && 'nightly' }}
+          push: ${{ github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop'}}

.gitignore

@@ -44,3 +44,10 @@ testem.log
 # System Files
 .DS_Store
 Thumbs.db
+src/assets/config/config.dev.json
+src/assets/config/config.prod.default.json
+src/assets/config/config.prod.json
+src/assets/config/config.theming.json
+src/assets/config/config.prod.default.json
+/src/assets/config/theming.scss
+/.angular

README.md

@@ -3,10 +3,11 @@ This project is the web frontent UI of openslice implementation around the Servi
 
 When developing under src/assets/config copy config.prod.default.json to config.dev.json to point to you API and Keycloak servers. Non-static URLs are also supported. If {BASEURL} is detected in any of file's properties, it is replaced by the current browser URL origin (protocol + hostname + port), as defined during application bootstrap.
 
-Also under src/assets/config copy config.theming.default.json to config.theming.json to customise your deployment, in terms of theming, branding, and specific HTML sections.
-Available values:
-* THEME_ID: "theme1", "theme2", "theme3"
-* Logo/Icon paths support both project's relative paths and absolute URLs
+Regarding theming, under src/assets/config
+* copy config.theming.default.json to config.theming.json to customise your deployment, in terms of branding, and specific HTML sections.
+* copy theming.default.scss to theming.scss to customise your color palettes.
+
+*Logo/Icon paths support both project's relative paths and absolute URLs*
 
 Execute:
 

angular.json

@@ -17,24 +17,29 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
+            "allowedCommonJsDependencies": ["jwt-decode"],
             "outputPath": "dist/io-openslice-portal-web",
             "index": "src/index.html",
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",
             "tsConfig": "tsconfig.app.json",
-            "aot": false,
+            "aot": true,
             "assets": [
               "src/favicon.ico",
-              "src/assets"
+              {
+                "glob": "**/*",
+                "input": "src/assets/",
+                "output": "/assets/"
+              }
             ],
             "styles": [
               "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
-              "src/styles.scss",
               "node_modules/@fortawesome/fontawesome-free/css/all.min.css",
+              "src/styles.scss",
               "node_modules/ngx-toastr/toastr.css"
             ],
             "scripts": [
-              "node_modules/marked/lib/marked.js",
+              "node_modules/marked/marked.min.js",
               "node_modules/blockly/blockly_compressed.js",
               "node_modules/blockly/blocks_compressed.js",
               "node_modules/blockly/msg/js/en.js",
@@ -54,9 +59,7 @@
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
-              "extractCss": true,
               "namedChunks": false,
-              "aot": true,
               "extractLicenses": true,
               "vendorChunk": false,
               "buildOptimizer": true,
@@ -72,6 +75,16 @@
                   "maximumError": "10kb"
                 }
               ]
+            },
+            "development": {
+              "optimization": false,
+              "outputHashing": "all",
+              "sourceMap": true,
+              "namedChunks": true,
+              "extractLicenses": false,
+              "vendorChunk": true,
+              "buildOptimizer": false,
+              "budgets": []
             }
           }
         },
@@ -83,6 +96,9 @@
           "configurations": {
             "production": {
               "browserTarget": "io-openslice-portal-web:build:production"
+            },
+            "development": {
+              "browserTarget": "io-openslice-portal-web:build:development"
             }
           }
         },

e2e/tsconfig.json

@@ -3,7 +3,7 @@
   "compilerOptions": {
     "outDir": "../out-tsc/e2e",
     "module": "commonjs",
-    "target": "es5",
+    "target": "es2018",
     "types": [
       "jasmine",
       "jasminewd2",