Merge branch 'develop' of https://github.com/hubmapconsortium/ccf-ui

hubmapconsortium · Sep 18, 2023 · b195e5d · b195e5d
2 parents 769f4bc + 04dfdf1
commit b195e5d
Show file tree

Hide file tree

Showing 281 changed files with 27,170 additions and 20,902 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -70,7 +70,6 @@
         "indent": "off",
         "keyword-spacing": "off",
         "no-dupe-class-members": "off",
-        "no-duplicate-imports": "off",
         "no-implied-eval": "off",
         "no-return-await": "off",
         "no-shadow": "off",
@@ -181,7 +180,6 @@
             "format": ["camelCase", "UPPER_CASE"]
           }
         ],
-        "@typescript-eslint/no-duplicate-imports": "error",
         "@typescript-eslint/no-explicit-any": [
           "error",
           {

diff --git a/.github/workflows/beta-build.yml b/.github/workflows/beta-build.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [18.x]
 
     steps:
       - uses: actions/checkout@v2
@@ -35,16 +35,16 @@ jobs:
       - run: npm run build:libs
       - name: Build EUI
         run: |
-          npm run build -- --output-hashing=none --base-href=/ --configuration=staging
+          npm run build ccf-eui -- --output-hashing=none --base-href=/ --configuration=staging
           npm run build:ccf-eui:wc
       - name: Build RUI
         run: |
-          npm run build -- --project ccf-rui --output-hashing=none --base-href=/rui/ --configuration=staging
+          npm run build ccf-rui -- --project ccf-rui --output-hashing=none --base-href=/rui/ --configuration=staging
           npm run build:ccf-rui:wc
           cp -r dist/ccf-rui dist/ccf-ui/rui
       - name: Build Organ Info
         run: |
-          npm run build -- --project ccf-organ-info --output-hashing=none --base-href=/organ-info/ --configuration=staging
+          npm run build ccf-organ-info -- --project ccf-organ-info --output-hashing=none --base-href=/organ-info/ --configuration=staging
           npm run build:ccf-organ-info:wc
           cp -r dist/ccf-organ-info dist/ccf-ui/organ-info
       - run: |

diff --git a/.github/workflows/build-previews.yml b/.github/workflows/build-previews.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [18.x]
 
     steps:
       - uses: actions/checkout@v1
@@ -33,23 +33,23 @@ jobs:
       - run: npm run build:libs
       - name: Build EUI
         run: |
-          npm run build -- --output-hashing=none --base-href=/ --configuration=staging
+          npm run build ccf-eui -- --output-hashing=none --base-href=/ --configuration=staging
           npm run build:ccf-eui:wc
       - name: Build RUI
         run: |
-          npm run build -- --project ccf-rui --output-hashing=none --base-href=/rui/ --configuration=staging
+          npm run build ccf-rui -- --project ccf-rui --output-hashing=none --base-href=/rui/ --configuration=staging
           npm run build:ccf-rui:wc
           mkdir -p dist/ccf-ui
           cp -r dist/ccf-rui dist/ccf-ui/rui
       - name: Build Organ Info
         run: |
-          npm run build -- --project ccf-organ-info --output-hashing=none --base-href=/organ-info/ #--configuration=staging
+          npm run build ccf-organ-info -- --project ccf-organ-info --output-hashing=none --base-href=/organ-info/ #--configuration=staging
           #npm run build:ccf-organ-info:wc
           mkdir -p dist/ccf-ui
           cp -r dist/ccf-organ-info dist/ccf-ui/organ-info
       - name: Build Body UI WC
         run: |
-          npm run build -- --project ccf-body-ui-wc --output-hashing=none --base-href=/body-ui/ #--configuration=staging
+          npm run build ccf-body-ui-wc -- --project ccf-body-ui-wc --output-hashing=none --base-href=/body-ui/ #--configuration=staging
           npm run build:ccf-body-ui-wc:wc
           mkdir -p dist/ccf-ui
           cp -r dist/ccf-body-ui-wc dist/ccf-ui/body-ui

diff --git a/.github/workflows/production-build.yml b/.github/workflows/production-build.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [18.x]
 
     steps:
       - uses: actions/checkout@v2
@@ -39,21 +39,21 @@ jobs:
       - run: npm run build:libs
       - name: Build EUI
         run: |
-          npm run build -- --output-hashing=none --base-href=/ccf-ui/
+          npm run build ccf-eui -- --output-hashing=none --base-href=/ccf-ui/
           npm run build:ccf-eui:wc
       - name: Build RUI
         run: |
-          npm run build -- --project ccf-rui --output-hashing=none --base-href=/ccf-ui/rui/
+          npm run build ccf-rui -- --project ccf-rui --output-hashing=none --base-href=/ccf-ui/rui/
           npm run build:ccf-rui:wc
           cp -r dist/ccf-rui dist/ccf-ui/rui
       - name: Build Organ Info
         run: |
-          npm run build -- --project ccf-organ-info --output-hashing=none --base-href=/ccf-ui/organ-info/ --configuration=staging
+          npm run build ccf-organ-info -- --project ccf-organ-info --output-hashing=none --base-href=/ccf-ui/organ-info/ --configuration=staging
           npm run build:ccf-organ-info:wc
           cp -r dist/ccf-organ-info dist/ccf-ui/organ-info
       - name: Build Body UI WC
         run: |
-          npm run build -- --project ccf-body-ui-wc --output-hashing=none --base-href=/body-ui/ #--configuration=staging
+          npm run build ccf-body-ui-wc -- --project ccf-body-ui-wc --output-hashing=none --base-href=/body-ui/ #--configuration=staging
           npm run build:ccf-body-ui-wc:wc
           mkdir -p dist/ccf-ui
           cp -r dist/ccf-body-ui-wc dist/ccf-ui/body-ui

diff --git a/.github/workflows/staging-build.yml b/.github/workflows/staging-build.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [18.x]
 
     steps:
       - uses: actions/checkout@v2
@@ -39,21 +39,21 @@ jobs:
       - run: npm run build:libs
       - name: Build EUI
         run: |
-          npm run build -- --output-hashing=none --base-href=/ --configuration=staging
+          npm run build ccf-eui -- --output-hashing=none --base-href=/ --configuration=staging
           npm run build:ccf-eui:wc
       - name: Build RUI
         run: |
-          npm run build -- --project ccf-rui --output-hashing=none --base-href=/rui/ --configuration=staging
+          npm run build ccf-rui -- --project ccf-rui --output-hashing=none --base-href=/rui/ --configuration=staging
           npm run build:ccf-rui:wc
           cp -r dist/ccf-rui dist/ccf-ui/rui
       - name: Build Organ Info
         run: |
-          npm run build -- --project ccf-organ-info --output-hashing=none --base-href=/organ-info/ --configuration=staging
+          npm run build ccf-organ-info -- --project ccf-organ-info --output-hashing=none --base-href=/organ-info/ --configuration=staging
           npm run build:ccf-organ-info:wc
           cp -r dist/ccf-organ-info dist/ccf-ui/organ-info
       - name: Build Body UI WC
         run: |
-          npm run build -- --project ccf-body-ui-wc --output-hashing=none --base-href=/body-ui/ #--configuration=staging
+          npm run build ccf-body-ui-wc -- --project ccf-body-ui-wc --output-hashing=none --base-href=/body-ui/ #--configuration=staging
           npm run build:ccf-body-ui-wc:wc
           mkdir -p dist/ccf-ui
           cp -r dist/ccf-body-ui-wc dist/ccf-ui/body-ui

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [18.x]
 
     steps:
       - uses: actions/checkout@v1

diff --git a/.gitignore b/.gitignore
@@ -40,6 +40,7 @@ speed-measure-plugin*.json
 .venv
 
 # misc
+/.angular/cache
 /.sass-cache
 /connect.lock
 /coverage

diff --git a/angular.json b/angular.json
@@ -29,6 +29,9 @@
             "styles": [
               "projects/ccf-eui/src/styles.scss"
             ],
+            "stylePreprocessorOptions": {
+              "includePaths": ["node_modules/swiper"]
+            },
             "scripts": [
               {
                 "input": "node_modules/document-register-element/build/document-register-element.js"
@@ -831,9 +834,10 @@
       }
     }
   },
-  "defaultProject": "ccf-eui",
   "cli": {
     "analytics": "40bb8025-0693-4352-b08d-efd2a1f935cd",
-    "defaultCollection": "@angular-eslint/schematics"
+    "schematicCollections": [
+      "@angular-eslint/schematics"
+    ]
   }
 }
diff --git a/openapitools.json b/openapitools.json
@@ -2,6 +2,6 @@
   "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json",
   "spaces": 2,
   "generator-cli": {
-    "version": "5.4.0"
+    "version": "6.6.0"
   }
 }