Merge pull request #345 from NUM-Forschungsdatenplattform/release/v1.8.0

Release/v1.8.0
NUM-Forschungsdatenplattform · Jan 12, 2022 · 22238a0 · 22238a0
2 parents 89edf3d + 7f898f7
commit 22238a0
Show file tree

Hide file tree

Showing 184 changed files with 27,389 additions and 44,689 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -26,7 +26,7 @@ workflows:
                 - nightly-builds
     jobs:
       - test:
-          context: 
+          context:
             - org-global
             - slack-secrets
             - ms_teams
@@ -38,19 +38,19 @@ workflows:
   build_and_test:
     jobs:
       - test:
-          context: 
+          context:
             - org-global
             - slack-secrets
             - ms_teams
       - security_scan:
-          context: 
+          context:
             - org-global
             - slack-secrets
             - ms_teams
           filters:
             branches:
               only:
-                - /^(release\/v\d+\.\d+\.\d+|hotfix\/v\d+\.\d+\.\d+|master)$/
+                - /^(release\/v\d+\.\d+\.\d+|hotfix\/v\d+\.\d+\.\d+|master|develop)$/
       - tag_version:
           requires:
             - test
@@ -147,7 +147,7 @@ jobs:
             )
             echo "$MS_TEAMS_MSG_TEMPLATE" > /tmp/ms_teams_message
           when: always
-      - run:    
+      - run:
           name: Report Build Success
           command: |
             MSG_PATH=/tmp/ms_teams_success_message
@@ -160,11 +160,11 @@ jobs:
             MSG_PATH=/tmp/ms_teams_failure_message
             sed -e 's/__build_status__/Failed/' -e 's/__theme_color__/e2091d/' /tmp/ms_teams_message > $MSG_PATH
             curl --fail -H "Content-Type: application/json" --data-binary @$MSG_PATH $CODEX_NOTIFICATIONS
-          when: on_fail    
+          when: on_fail
   test:
     docker:
-      # - image: circleci/node:14.9.0-buster
-      - image: cimg/node:14.9.0
+      # - image: circleci/node:16.13.0-buster
+      - image: cimg/node:16.13.0
     steps:
       - checkout
       - node/install-packages:
@@ -187,7 +187,7 @@ jobs:
       - failed-build-slack-notification
   tag_version:
     docker:
-      - image: cimg/node:14.9.0
+      - image: cimg/node:16.13.0
     steps:
       - checkout
       - add_ssh_keys:
@@ -211,7 +211,7 @@ jobs:
 
   build_and_deploy:
     docker:
-      - image: cimg/node:14.9.0
+      - image: cimg/node:16.13.0
         auth:
           username: $DOCKER_USER
           password: $DOCKER_HUB_PASSWORD
@@ -300,7 +300,7 @@ commands:
             )
             echo "$MS_TEAMS_MSG_TEMPLATE" > /tmp/ms_teams_message
           when: always
-      - run:    
+      - run:
           name: Report Build Success
           command: |
             MSG_PATH=/tmp/ms_teams_success_message
@@ -313,7 +313,7 @@ commands:
             MSG_PATH=/tmp/ms_teams_failure_message
             sed -e 's/__build_status__/Failed/' -e 's/__theme_color__/e2091d/' /tmp/ms_teams_message > $MSG_PATH
             curl --fail -H "Content-Type: application/json" --data-binary @$MSG_PATH $CODEX_NOTIFICATIONS
-          when: on_fail    
+          when: on_fail
 
 orbs:
   sonarcloud: sonarsource/[email protected]

diff --git a/.eslintrc.json b/.eslintrc.json
@@ -0,0 +1,41 @@
+{
+  "root": true,
+  "ignorePatterns": ["dist", "coverage"],
+  "parserOptions": {
+    "ecmaVersion": 2020
+  },
+  "overrides": [
+    {
+      "files": ["*.ts"],
+      "parserOptions": {
+        "project": ["tsconfig.json"],
+        "createDefaultProgram": true
+      },
+      "extends": [
+        "plugin:@angular-eslint/recommended",
+        "eslint:recommended",
+        "plugin:@typescript-eslint/recommended",
+        "plugin:prettier/recommended"
+      ],
+      "rules": {
+        "@typescript-eslint/no-non-null-assertion": "warn",
+        "@typescript-eslint/no-empty-function": "off",
+        "@typescript-eslint/no-explicit-any": "off",
+        "@angular-eslint/component-class-suffix": "off",
+        "@typescript-eslint/no-unused-vars": [
+          "warn",
+          {
+            "argsIgnorePattern": "^_",
+            "varsIgnorePattern": "^_",
+            "caughtErrorsIgnorePattern": "^_"
+          }
+        ]
+      }
+    },
+    {
+      "files": ["*.html"],
+      "extends": ["plugin:@angular-eslint/template/recommended", "plugin:prettier/recommended"],
+      "rules": {}
+    }
+  ]
+}
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,9 @@
 /bazel-out
 /reports
 
+#angular cache
+.angular/cache
+
 # dependencies
 /node_modules
 

diff --git a/.prettierrc b/.prettierrc
@@ -5,5 +5,16 @@
   "tabWidth": 2,
   "bracketSpacing": true,
   "trailingComma": "es5",
-  "semi": false
+  "semi": false,
+  "overrides": [
+    {
+      "files": [
+        "index.html",
+        "silent-refresh.html"
+      ],
+      "options": {
+        "parser": "html"
+      }
+    }
+  ]
 }
diff --git a/angular.json b/angular.json
@@ -78,37 +78,31 @@
                   "maximumError": "10kb"
                 }
               ]
+            },
+            "development": {
+              "buildOptimizer": false,
+              "optimization": false,
+              "vendorChunk": true,
+              "extractLicenses": false,
+              "sourceMap": true,
+              "namedChunks": true
             }
           }
         },
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
           "options": {
-            "browserTarget": "num-portal-webapp:build",
             "proxyConfig": "proxy.conf.json"
           },
           "configurations": {
             "deploy": {
               "browserTarget": "num-portal-webapp:build:deploy"
-            }
-          },
-          "assets": [
-            {
-              "glob": "loader.js",
-              "input": "node_modules/monaco-editor/dev/vs",
-              "output": "./vs/"
             },
-            {
-              "glob": "**/*",
-              "input": "node_modules/monaco-editor/dev/vs/editor",
-              "output": "./vs/editor"
-            },
-            {
-              "glob": "**/*",
-              "input": "node_modules/monaco-editor/dev/vs/base",
-              "output": "./vs/base"
+            "development": {
+              "browserTarget": "num-portal-webapp:build:development"
             }
-          ]
+          },
+          "defaultConfiguration": "development"
         },
         "extract-i18n": {
           "builder": "@angular-devkit/build-angular:extract-i18n",
@@ -117,15 +111,11 @@
           }
         },
         "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
+          "builder": "@angular-eslint/builder:lint",
           "options": {
-            "tsConfig": [
-              "tsconfig.app.json",
-              "tsconfig.spec.json",
-              "e2e/tsconfig.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
+            "lintFilePatterns": [
+              "src/**/*.ts",
+              "src/**/*.html"
             ]
           }
         },
@@ -189,5 +179,8 @@
       }
     }
   },
-  "defaultProject": "num-portal-webapp"
+  "defaultProject": "num-portal-webapp",
+  "cli": {
+    "defaultCollection": "@angular-eslint/schematics"
+  }
 }
diff --git a/jest.config.js b/jest.config.js
@@ -20,6 +20,8 @@ const { compilerOptions } = require('./tsconfig')
 module.exports = {
   preset: 'jest-preset-angular',
   roots: ['<rootDir>/src/'],
+  modulePaths: ['<rootDir>'],
+  moduleDirectories: ['node_modules'],
   testMatch: ['**/+(*.)+(spec).+(ts)'],
   setupFilesAfterEnv: ['<rootDir>/src/test.ts'],
   collectCoverage: true,