Merge branch 'develop' into 'master' for 5.2.0 release

.devcontainer/devcontainer.json

@@ -11,38 +11,42 @@
   // node_modules as volume
   // https://code.visualstudio.com/remote/advancedcontainers/improve-performance#_use-a-targeted-named-volume
   "mounts": ["target=${containerWorkspaceFolder}/node_modules,type=volume"],
-  "settings": {
-    "terminal.integrated.profiles.linux": {
-      "zsh": {
-        "path": "zsh",
-        "args": ["-l"]
-      }
-    },
-    "terminal.integrated.defaultProfile.linux": "zsh"
+  "customizations": {
+    "vscode": {
+      "settings": {
+        "terminal.integrated.profiles.linux": {
+          "zsh": {
+            "path": "zsh",
+            "args": ["-l"]
+          }
+        },
+        "terminal.integrated.defaultProfile.linux": "zsh"
+      },
+      "extensions": [
+        // synchronize-marker:vscode-extensions:begin
+        // general
+        "vscode-icons-team.vscode-icons",
+        // code assist
+        "visualstudioexptteam.vscodeintellicode",
+        "angular.ng-template",
+        "mikael.angular-beastcode",
+        // code style + formatting
+        "editorconfig.editorconfig",
+        "esbenp.prettier-vscode",
+        "stylelint.vscode-stylelint",
+        "dbaeumer.vscode-eslint",
+        // testing
+        "andys8.jest-snippets",
+        // documentation
+        "streetsidesoftware.code-spell-checker"
+        // synchronize-marker:vscode-extensions:end
+      ]
+    }
   },
-  "extensions": [
-    // synchronize-marker:vscode-extensions:begin
-    // general
-    "vscode-icons-team.vscode-icons",
-    // code assist
-    "visualstudioexptteam.vscodeintellicode",
-    "angular.ng-template",
-    "mikael.angular-beastcode",
-    // code style + formatting
-    "editorconfig.editorconfig",
-    "esbenp.prettier-vscode",
-    "stylelint.vscode-stylelint",
-    "dbaeumer.vscode-eslint",
-    // testing
-    "andys8.jest-snippets",
-    // documentation
-    "streetsidesoftware.code-spell-checker"
-    // synchronize-marker:vscode-extensions:end
-  ],
   "forwardPorts": [4200],
   // get correct nodejs version from package.json
   "postCreateCommand": ". $NVM_DIR/nvm.sh && nvm install $(node -p -e 'require(\"./package.json\").engines.node')",
   // install node modules
-  "postStartCommand": "sudo chown node node_modules eslint-rules && npm i --no-save --no-audit --prefer-offline --maxsockets 4",
+  "postStartCommand": "sudo chown node node_modules eslint-rules && npm i",
   "remoteUser": "node"
 }

.dockerignore

@@ -16,7 +16,6 @@
 /*.sublime-workspace
 /.nb-gradle
 /nbproject/
-/.nvmrc
 /.vim/
 /.angular/cache
 **/*.log

.eslintrc.json

@@ -43,6 +43,12 @@
             "style": "camelCase"
           }
         ],
+        "@angular-eslint/pipe-prefix": [
+          "error",
+          {
+            "prefixes": ["ish"]
+          }
+        ],
         "@angular-eslint/sort-ngmodule-metadata-arrays": "warn",
         "@ngrx/avoid-combining-selectors": "off",
         "@ngrx/avoid-mapping-selectors": "off",
@@ -103,19 +109,30 @@
           {
             "selector": "variable",
             "modifiers": ["const"],
-            "format": ["camelCase", "UPPER_CASE"],
-            "filter": {
-              "regex": "_",
-              "match": false
-            }
+            "format": ["camelCase", "UPPER_CASE"]
           },
           {
             "selector": "typeLike",
             "format": ["PascalCase"]
           },
           {
-            "selector": "function",
+            "selector": ["function", "classMethod", "classProperty"],
+            "format": ["camelCase"]
+          },
+          {
+            "selector": "classProperty",
+            "modifiers": ["static"],
+            "format": ["camelCase", "UPPER_CASE"]
+          },
+          {
+            "selector": "parameter",
             "format": ["camelCase"]
+          },
+          {
+            "selector": "parameter",
+            "modifiers": ["unused"],
+            "format": ["camelCase"],
+            "leadingUnderscore": "require"
           }
         ],
         "@typescript-eslint/no-empty-function": "warn",
@@ -134,7 +151,10 @@
             "allowTernary": true
           }
         ],
-        "@typescript-eslint/no-unused-vars": "off",
+        "@typescript-eslint/no-unused-vars": [
+          "error",
+          { "argsIgnorePattern": "^_" }
+        ],
         "@typescript-eslint/prefer-optional-chain": "warn",
         "arrow-body-style": ["warn", "as-needed"],
         "arrow-parens": ["warn", "as-needed"],
@@ -216,7 +236,7 @@
               "message": "use star imports only for aggregation of deeper lying imports"
             },
             {
-              "importNamePattern": "^(?!(range|uniq|memoize|once|groupBy|countBy|flatten|isEqual|intersection|pick|differenceBy|unionBy|mergeWith|snakeCase|capitalize)$).*",
+              "importNamePattern": "^(?!(range|uniq|memoize|once|groupBy|countBy|isEqual|intersection|pick|differenceBy|unionBy|mergeWith|snakeCase|capitalize)$).*",
               "name": "lodash.*",
               "filePattern": "^.*/src/app/(?!.*\\.spec\\.ts$).*\\.ts$",
               "message": "importing this operator from lodash is forbidden"
@@ -359,6 +379,12 @@
               "name": "ish-core/utils/dom/dom.service",
               "filePattern": "^.*\\.(component|directive)\\.ts*$",
               "message": "The \"DomService\" should only be used in injectable classes. Use the Angular \"Renderer2\" instead."
+            },
+            {
+              "importNamePattern": "^(F|f)eatureToggle",
+              "name": "ish-core/utils/feature-toggle/feature-toggle.service",
+              "filePattern": "^.*\\.ts*$",
+              "message": "Feature toggle related functionality should only be imported from the FeatureToggleModule"
             }
           ]
         ],

.github/workflows/automated-update.yml

@@ -6,8 +6,8 @@ on:
     types: [opened, synchronize]
     paths:
       - scripts/update-pwa.js
-  schedule:
-    - cron: '0 0 * * 1'
+  # schedule:
+  #   - cron: '0 0 * * 1'
 
 env:
   NODE_VERSION: 18.16.0

.github/workflows/dead-code.yml

@@ -2,9 +2,9 @@ name: DeadCode
 
 on:
   workflow_dispatch:
-  schedule:
-    # every sunday at midnight
-    - cron: '0 0 * * 0'
+  # schedule:
+  #   # every sunday at midnight
+  #   - cron: '0 0 * * 0'
 
 env:
   NODE_VERSION: 18.16.0

.github/workflows/development.yml

@@ -160,7 +160,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Production Build PWA Image
-        run: docker-compose build pwa
+        run: docker compose build pwa
 
   Nginx:
     needs: [Quality, Jest]
@@ -170,4 +170,4 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Build Nginx Image
-        run: docker-compose build nginx
+        run: docker compose build nginx

.github/workflows/mark-conflicts.yml

@@ -5,6 +5,10 @@ on:
   push:
     branches:
       - develop
+  pull_request:
+    types:
+      - opened
+      - synchronize
 
 jobs:
   triage:

.github/workflows/updates.yml

@@ -1,13 +1,14 @@
 name: Updates
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - develop
       - upgrade/**
       - update/**
-  schedule:
-    - cron: '0 0 * * *'
+  # schedule:
+  #   - cron: '0 0 * * *'
 
 env:
   NODE_VERSION: 18.16.0
@@ -39,8 +40,12 @@ jobs:
         if: always()
         run: npm outdated --long || true
 
-      - name: Must Have Updates for PWA
-        run: npm audit --omit=dev
+      - name: Production npm audit
+        run: npm audit --omit=dev || true
+        if: always()
+
+      - name: Better NPM Audit (for relevant vulnerability checking)
+        run: npm run audit --production
         if: always()
 
       - name: Peer Dependency Incompatibilities

.gitignore

@@ -17,7 +17,6 @@ node_modules
 /*.sublime-workspace
 /.nb-gradle
 /nbproject/
-/.nvmrc
 /.vim/
 
 # misc

.nsprc

@@ -0,0 +1,4 @@
+{
+  "GHSA-vc8w-jr9v-vj7f": "Ignored since we don't use Bootstrap Javascript (only Bootstrap styling with ng-bootstrap)",
+  "GHSA-952p-6rrq-rcjv": "Ignoring for now since there is no known fix"
+}

.nvmrc

@@ -0,0 +1 @@
+v18.16.0

.prettierignore

@@ -23,11 +23,13 @@
 *.crt
 *.key
 *.lua
+*.xml
 .*ignore
 .husky
 .gitattributes
 .editorconfig
-.createMockdata.table
+.nvmrc
+.nsprc
 package*.json
 Dockerfile*
 .browserslistrc
@@ -50,5 +52,4 @@ nginx.conf
 /.idea/
 /charts/**/templates/*
 *~
-/src/environments/environment.local.ts
 /src/environments/environment.development.ts

.stylelintrc.json

@@ -9,26 +9,21 @@
   "rules": {
     "alpha-value-notation": "number",
     "at-rule-no-vendor-prefix": true,
-    "color-function-notation": "legacy",
     "color-named": "never",
     "font-family-name-quotes": "always-unless-keyword",
     "function-url-no-scheme-relative": true,
     "function-url-quotes": "always",
     "import-notation": "string",
     "media-feature-name-no-vendor-prefix": true,
     "media-feature-name-no-unknown": true,
-    "media-query-no-invalid": null,
     "no-descending-specificity": null,
-    "no-duplicate-selectors": true,
     "property-no-vendor-prefix": true,
     "selector-no-vendor-prefix": true,
     "selector-not-notation": "simple",
     "selector-pseudo-element-no-unknown": [
       true,
       { "ignorePseudoElements": ["ng-deep"] }
     ],
-    "scss/comment-no-empty": null,
-    "scss/no-global-function-names": null,
     "value-keyword-case": "lower",
     "value-no-vendor-prefix": true
   }

.vscode/intershop.txt

@@ -153,6 +153,7 @@ rediss
 refactoring
 refactorings
 resetted
+rgba
 roadmap
 roboto
 robotobold