Merge pull request #1563 from SciCatProject/load-user-defaults-from-be

Load/Upload user filters and conditions from/to be
SciCatProject · Oct 3, 2024 · 01dcc9c · 01dcc9c
2 parents 59618bf + 4333f51
commit 01dcc9c
Show file tree

Hide file tree

Showing 51 changed files with 1,243 additions and 572 deletions.
diff --git a/.gitignore b/.gitignore
@@ -53,3 +53,6 @@ Thumbs.db
 /cypress/downloads/*
 *.mp4
 .angular
+
+# karma
+karma-junit.xml
diff --git a/CI/ESS/e2e/config.e2e.json b/CI/ESS/e2e/config.e2e.json
@@ -26,80 +26,6 @@
   "jupyterHubUrl": "https://jupyterhub.esss.lu.se/",
   "landingPage": "doi.ess.eu/detail/",
   "lbBaseURL": "http://localhost:3000",
-  "localColumns": [
-    {
-      "name": "select",
-      "order": 0,
-      "type": "standard",
-      "enabled": true
-    },
-    {
-      "name": "datasetName",
-      "order": 1,
-      "type": "standard",
-      "enabled": true
-    },
-    {
-      "name": "runNumber",
-      "order": 2,
-      "type": "standard",
-      "enabled": true
-    },
-    {
-      "name": "sourceFolder",
-      "order": 3,
-      "type": "standard",
-      "enabled": true
-    },
-    {
-      "name": "size",
-      "order": 4,
-      "type": "standard",
-      "enabled": true
-    },
-    {
-      "name": "creationTime",
-      "order": 5,
-      "type": "standard",
-      "enabled": true
-    },
-    {
-      "name": "type",
-      "order": 6,
-      "type": "standard",
-      "enabled": true
-    },
-    {
-      "name": "image",
-      "order": 7,
-      "type": "standard",
-      "enabled": true
-    },
-    {
-      "name": "metadata",
-      "order": 8,
-      "type": "standard",
-      "enabled": true
-    },
-    {
-      "name": "proposalId",
-      "order": 9,
-      "type": "standard",
-      "enabled": true
-    },
-    {
-      "name": "ownerGroup",
-      "order": 10,
-      "type": "standard",
-      "enabled": false
-    },
-    {
-      "name": "dataStatus",
-      "order": 11,
-      "type": "standard",
-      "enabled": false
-    }
-  ],
   "logbookEnabled": true,
   "loginFormEnabled": true,
   "maxDirectDownloadSize": 5000000000,
@@ -126,5 +52,108 @@
   "shoppingCartOnHeader": true,
   "tableSciDataEnabled": true,
   "datasetDetailsShowMissingProposalId": false,
-  "notificationInterceptorEnabled": true
+  "notificationInterceptorEnabled": true,
+  "labelMaps": {
+    "filters": {
+      "LocationFilter": "Location",
+      "PidFilter": "Pid",
+      "GroupFilter": "Group",
+      "TypeFilter": "Type",
+      "KeywordFilter": "Keyword",
+      "DateRangeFilter": "Start Date - End Date",
+      "TextFilter": "Text"
+    }
+  },
+  "defaultDatasetsListSettings": {
+    "columns": [
+      {
+        "name": "select",
+        "order": 0,
+        "type": "standard",
+        "enabled": true
+      },
+      {
+        "name": "pid",
+        "order": 1,
+        "type": "standard",
+        "enabled": true
+      },
+      {
+        "name": "datasetName",
+        "order": 2,
+        "type": "standard",
+        "enabled": true
+      },
+      {
+        "name": "runNumber",
+        "order": 3,
+        "type": "standard",
+        "enabled": true
+      },
+      {
+        "name": "sourceFolder",
+        "order": 4,
+        "type": "standard",
+        "enabled": true
+      },
+      {
+        "name": "size",
+        "order": 5,
+        "type": "standard",
+        "enabled": true
+      },
+      {
+        "name": "creationTime",
+        "order": 6,
+        "type": "standard",
+        "enabled": true
+      },
+      {
+        "name": "type",
+        "order": 7,
+        "type": "standard",
+        "enabled": true
+      },
+      {
+        "name": "image",
+        "order": 8,
+        "type": "standard",
+        "enabled": true
+      },
+      {
+        "name": "metadata",
+        "order": 9,
+        "type": "standard",
+        "enabled": false
+      },
+      {
+        "name": "proposalId",
+        "order": 10,
+        "type": "standard",
+        "enabled": true
+      },
+      {
+        "name": "ownerGroup",
+        "order": 11,
+        "type": "standard",
+        "enabled": false
+      },
+      {
+        "name": "dataStatus",
+        "order": 12,
+        "type": "standard",
+        "enabled": false
+      }
+    ],
+    "filters": [
+      { "LocationFilter": true },
+      { "PidFilter": true },
+      { "GroupFilter": true },
+      { "TypeFilter": true },
+      { "KeywordFilter": true },
+      { "DateRangeFilter": true },
+      { "TextFilter": true }
+    ],
+    "conditions": []
+  }
 }
diff --git a/CI/ESS/e2e/cypress.config.ts b/CI/ESS/e2e/cypress.config.ts
@@ -4,7 +4,7 @@ export default defineConfig({
   e2e: {
     baseUrl: "http://localhost:4200",
     lbBaseUrl: "http://localhost:3000/api/v3",
-    lbLoginEndpoint: "/Users/login?include=user",
+    lbLoginEndpoint: "/auth/login?include=user",
     lbTokenPrefix: "Bearer ",
     viewportWidth: 1280,
     username: "admin",

diff --git a/CI/ESS/e2e/cypress.github.ts b/CI/ESS/e2e/cypress.github.ts
@@ -4,7 +4,7 @@ export default defineConfig({
   e2e: {
     baseUrl: "http://localhost:8080",
     lbBaseUrl: "http://localhost:8080/api/v3",
-    lbLoginEndpoint: "/Users/login",
+    lbLoginEndpoint: "/auth/login",
     lbTokenPrefix: "Bearer ",
     viewportWidth: 1280,
     username: "admin",

diff --git a/CI/ESS/e2e/cypress.nestjs.ts b/CI/ESS/e2e/cypress.nestjs.ts
@@ -4,7 +4,7 @@ export default defineConfig({
   e2e: {
     baseUrl: "http://localhost:80",
     lbBaseUrl: "http://localhost:80/api/v3",
-    lbLoginEndpoint: "/Users/login",
+    lbLoginEndpoint: "/auth/login",
     lbTokenPrefix: "Bearer ",
     viewportWidth: 1280,
     username: "admin",

diff --git a/cypress.config.ts b/cypress.config.ts
@@ -4,7 +4,7 @@ export default defineConfig({
   e2e: {
     baseUrl: "http://127.0.0.1:4200",
     lbBaseUrl: "http://localhost:3000/api/v3",
-    lbLoginEndpoint: "/Users/login",
+    lbLoginEndpoint: "/auth/login",
     lbTokenPrefix: "Bearer ",
     viewportWidth: 1280,
     username: "admin",

diff --git a/karma.conf.js b/karma.conf.js
@@ -3,23 +3,23 @@
 
 module.exports = function (config) {
   config.set({
-    basePath: '',
-    frameworks: ['jasmine', '@angular-devkit/build-angular'],
+    basePath: "",
+    frameworks: ["jasmine", "@angular-devkit/build-angular"],
     plugins: [
-      require('karma-jasmine'),
-      require('karma-chrome-launcher'),
-      require('karma-jasmine-html-reporter'),
-      require('karma-coverage'),
-      require('karma-junit-reporter'),
-      require('karma-spec-reporter'),
-      require('@angular-devkit/build-angular/plugins/karma')
+      require("karma-jasmine"),
+      require("karma-chrome-launcher"),
+      require("karma-jasmine-html-reporter"),
+      require("karma-coverage"),
+      require("karma-junit-reporter"),
+      require("karma-spec-reporter"),
+      require("@angular-devkit/build-angular/plugins/karma"),
     ],
     proxies: {
-      '/assets/': '/base/src/assets/',
-      'assets/': '/base/src/assets/'
+      "/assets/": "/base/src/assets/",
+      "assets/": "/base/src/assets/",
     },
     mime: {
-      'text/x-typescript': ['ts', 'tsx']
+      "text/x-typescript": ["ts", "tsx"],
     },
     client: {
       jasmine: {
@@ -28,44 +28,50 @@ module.exports = function (config) {
         // for example, you can disable the random execution with `random: false`
         // or set a specific seed with `seed: 4321`
       },
-      clearContext: false // leave Jasmine Spec Runner output visible in browser
+      clearContext: false, // leave Jasmine Spec Runner output visible in browser
     },
     jasmineHtmlReporter: {
-      suppressAll: true // removes the duplicated traces
+      suppressAll: true, // removes the duplicated traces
     },
     junitReporter: {
-	    outputFile: 'karma-junit.xml',
-	    useBrowserName: false,
-	    outputDir: '.'
+      outputFile: "karma-junit.xml",
+      useBrowserName: false,
+      outputDir: ".",
     },
     coverageReporter: {
-      dir: require('path').join(__dirname, './coverage'),
+      dir: require("path").join(__dirname, "./coverage"),
       reporters: [
-        { type: 'html', subdir: 'report-html' },
-        { type: 'lcovonly', subdir: '.', file: 'lcov.info' },
-        { type: 'text-summary' }
+        { type: "html", subdir: "report-html" },
+        { type: "lcovonly", subdir: ".", file: "lcov.info" },
+        { type: "text-summary" },
       ],
-      fixWebpackSourcePaths: true
+      fixWebpackSourcePaths: true,
     },
     customLaunchers: {
       ChromeHeadless: {
-        base: 'Chrome',
+        base: "Chrome",
         flags: [
-          '--headless',
-          '--disable-gpu',
-          '--no-sandbox',
+          "--headless",
+          "--disable-gpu",
+          "--no-sandbox",
           // Without a remote debugging port, Google Chrome exits immediately.
-          '--remote-debugging-port=9222'
-        ]
-      }
+          "--remote-debugging-port=9222",
+        ],
+      },
+    },
+    reporters: ["progress", "coverage", "junit", "spec"],
+    specReporter: {
+      suppressPassed: true, // Suppress passed tests, only show failures
+      suppressSkipped: true, // Optionally suppress skipped tests too
+      suppressFailed: false,
     },
-    reporters: ['progress', 'coverage','junit','spec'],
     port: 9876,
     colors: true,
-    logLevel: config.LOG_DEBUG,
+    logLevel: config.LOG_ERROR, // For debug use config.LOG_DEBUG
     autoWatch: true,
-    browsers: ['ChromeHeadless'],
+    browsers: ["ChromeHeadless"],
     singleRun: true,
-    restartOnFileChange: true
+    restartOnFileChange: true,
+    failFast: false,
   });
 };