Merge pull request #231 from ilri/OpenRXV-2024

ilri · Dec 31, 2024 · a6b67e0 · a6b67e0
2 parents 6a30925 + cfb2653
commit a6b67e0
Show file tree

Hide file tree

Showing 115 changed files with 3,354 additions and 1,569 deletions.
diff --git a/backend/src/admin/settings/settings.controller.ts b/backend/src/admin/settings/settings.controller.ts
@@ -84,6 +84,10 @@ export class SettingsController {
     if (!(await this.jsonFilesService.GetDashboard(dashboard_name)))
       return new NotFoundException();
 
+    data.filters.map((filter) => {
+      filter.componentConfigs.defaultWithinFiltersOperator =
+        data.defaultWithinFiltersOperator;
+    });
     for (const dashboard of dashboards) {
       if (dashboard.name == dashboard_name) dashboard['explorer'] = data;
     }

diff --git a/frontend/.eslintrc.js b/frontend/.eslintrc.js
@@ -1,20 +1,24 @@
 /* eslint-env node */
 module.exports = {
-  extends: ['eslint:recommended', 'plugin:@typescript-eslint/recommended', 'prettier'],
+  extends: [
+    'eslint:recommended',
+    'plugin:@typescript-eslint/recommended',
+    'prettier',
+  ],
   parser: '@typescript-eslint/parser',
   plugins: ['@typescript-eslint', 'unused-imports'],
   root: true,
-  'rules': {
+  rules: {
     'no-unused-vars': 'off',
     'unused-imports/no-unused-imports': 'error',
     'unused-imports/no-unused-vars': [
       'warn',
       {
-        'vars': 'all',
-        'varsIgnorePattern': '^_',
-        'args': 'after-used',
-        'argsIgnorePattern': '^_'
-      }
-    ]
-  }
+        vars: 'all',
+        varsIgnorePattern: '^_',
+        args: 'after-used',
+        argsIgnorePattern: '^_',
+      },
+    ],
+  },
 };
diff --git a/frontend/.prettierrc b/frontend/.prettierrc
@@ -1,4 +1,4 @@
 {
   "singleQuote": true,
   "trailingComma": "all"
-}
+}
diff --git a/frontend/angular.json b/frontend/angular.json
@@ -22,8 +22,14 @@
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",
             "tsConfig": "src/tsconfig.app.json",
-            "assets": ["src/favicon.ico", "src/assets",
-                { "glob": "**/*", "input": "node_modules/tinymce", "output": "/tinymce/" }
+            "assets": [
+              "src/favicon.ico",
+              "src/assets",
+              {
+                "glob": "**/*",
+                "input": "node_modules/tinymce",
+                "output": "/tinymce/"
+              }
             ],
             "styles": [
               "src/styles.scss",
@@ -64,8 +70,7 @@
         },
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
-          "options": {
-          },
+          "options": {},
           "configurations": {
             "production": {
               "browserTarget": "RES:build:production"

diff --git a/frontend/e2e/protractor.conf.js b/frontend/e2e/protractor.conf.js
@@ -5,24 +5,24 @@ const { SpecReporter } = require('jasmine-spec-reporter');
 
 exports.config = {
   allScriptsTimeout: 11000,
-  specs: [
-    './src/**/*.e2e-spec.ts'
-  ],
+  specs: ['./src/**/*.e2e-spec.ts'],
   capabilities: {
-    'browserName': 'chrome'
+    browserName: 'chrome',
   },
   directConnect: true,
   baseUrl: 'http://localhost:4200/',
   framework: 'jasmine',
   jasmineNodeOpts: {
     showColors: true,
     defaultTimeoutInterval: 30000,
-    print: function() {}
+    print: function () {},
   },
   onPrepare() {
     require('ts-node').register({
-      project: require('path').join(__dirname, './tsconfig.e2e.json')
+      project: require('path').join(__dirname, './tsconfig.e2e.json'),
     });
-    jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
-  }
-};
+    jasmine
+      .getEnv()
+      .addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
+  },
+};
diff --git a/frontend/e2e/tsconfig.e2e.json b/frontend/e2e/tsconfig.e2e.json
@@ -4,10 +4,6 @@
     "outDir": "../out-tsc/app",
     "module": "commonjs",
     "target": "es2018",
-    "types": [
-      "jasmine",
-      "jasminewd2",
-      "node"
-    ]
+    "types": ["jasmine", "jasminewd2", "node"]
   }
 }