Merge pull request #1558 from SciCatProject/master

Release 11-12-2024

.env.example

@@ -78,4 +78,5 @@ ES_PASSWORD="duo-password"
 ES_REFRESH=<"wait_for"|"false">
 
 LOGGERS_CONFIG_FILE="loggers.json"
+DATASET_TYPES_FILE="datasetTypes.json"
 PROPOSAL_TYPES_FILE="proposalTypes.json"

.github/openapi/typescript-angular-config.json

@@ -1,6 +1,6 @@
 {
   "generatorName": "typescript-angular",
-  "npmName": "@scicatproject/scicat-sdk-ts",
+  "npmName": "@scicatproject/scicat-sdk-ts-angular",
   "ngVersion": "16.2.12",
   "withInterfaces": true
 }

.github/openapi/typescript-fetch-config.json

@@ -0,0 +1,5 @@
+{
+  "generatorName": "typescript-fetch",
+  "npmName": "@scicatproject/scicat-sdk-ts-fetch",
+  "supportsES6": true
+}

.github/workflows/release-and-publish-sdk.yml

@@ -152,11 +152,9 @@ jobs:
             --git-repo-id scicat-backend-next \
             --git-user-id SciCatProject \
             -o ./sdk/${{ matrix.generator }} $(
-            if [ "${{ matrix.generator }}" == "typescript-angular" ]; then
+            if [ "${{ matrix.generator }}" == "typescript-angular" ] || [ "${{ matrix.generator }}" == "typescript-fetch" ]; then
               echo "--additional-properties=npmVersion=${{ needs.build-release.outputs.new_tag}}";
-            elif [ "${{ matrix.generator }}" == "python" ]; then
-              echo "--additional-properties=packageVersion=${{ needs.build-release.outputs.new_tag}}";
-            elif [ "${{ matrix.generator }}" == "python-pydantic-v1" ]; then
+            elif [ "${{ matrix.generator }}" == "python" ] || [ "${{ matrix.generator }}" == "python-pydantic-v1" ]; then
               echo "--additional-properties=packageVersion=${{ needs.build-release.outputs.new_tag}}";
             fi
             )
@@ -169,9 +167,12 @@ jobs:
   npm-publish:
     needs: generate-upload-sdk
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        sdk_type: [typescript-angular, typescript-fetch]
     environment:
-      name: npm-sdk-package
-      url: https://www.npmjs.com/package/@scicatproject/scicat-sdk-ts
+      name: ${{ matrix.sdk_type }}-sdk-package
+      url: ${{ matrix.sdk_type == 'typescript-angular' && 'https://www.npmjs.com/package/@scicatproject/scicat-sdk-ts-angular' || 'https://www.npmjs.com/package/@scicatproject/scicat-sdk-ts-fetch' }}
 
     steps:
       - name: Checkout repository
@@ -183,19 +184,22 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
           registry-url: "https://registry.npmjs.org/"
 
-      - name: Download TypeScript Angular SDK Artifact
+      - name: Download TypeScript SDK Artifact
         uses: actions/download-artifact@v4
         with:
-          name: sdk-typescript-angular-${{github.sha}}
+          name: sdk-${{ matrix.sdk_type }}-${{ github.sha }}
           path: ./sdk
 
       - name: Publish package
         run: |
           npm install
           npm run build
-          cd dist
+          if [ "${{ matrix.sdk_type }}" == "typescript-angular" ]; then
+            # publish dist folder for typescript-angular
+            cd dist
+          fi
           npm publish --access public
-        working-directory: ./sdk/typescript-angular/
+        working-directory: ./sdk/${{ matrix.sdk_type }}/
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
 
@@ -223,7 +227,7 @@ jobs:
       - name: Download Python SDK Artifact
         uses: actions/download-artifact@v4
         with:
-          name: sdk-${{ matrix.sdk_type }}-${{github.sha}}
+          name: sdk-${{ matrix.sdk_type }}-${{ github.sha }}
           path: ./sdk
 
       - name: Install dependencies

.github/workflows/test.yml

@@ -173,6 +173,7 @@ jobs:
         run: |
           cp CI/ESS/docker-compose.api.yaml docker-compose.yaml
           cp functionalAccounts.json.test functionalAccounts.json
+          cp datasetTypes.example.json datasetTypes.json
           cp proposalTypes.example.json proposalTypes.json
           docker compose up --build -d
           npm run test:api

.gitignore

@@ -2,6 +2,7 @@
 /dist
 /node_modules
 functionalAccounts.json
+datasetTypes.json
 proposalTypes.json
 loggers.json
 

datasetTypes.example.json

@@ -0,0 +1,3 @@
+{
+  "Custom": "custom"
+}

migrations/20241202105905-multiple-principal-investigators.js

@@ -0,0 +1,31 @@
+module.exports = {
+  async up(db, client) {
+    await db.collection("Dataset").updateMany({}, [
+      {
+        $set: {
+          principalInvestigators: ["$principalInvestigator"],
+        },
+      },
+    ]);
+
+    await db
+      .collection("Dataset")
+      .updateMany({}, { $unset: { principalInvestigator: "" } });
+  },
+
+  async down(db, client) {
+    await db.collection("Dataset").updateMany({}, [
+      {
+        $set: {
+          principalInvestigator: {
+            $arrayElemAt: ["$principalInvestigators", 0],
+          },
+        },
+      },
+    ]);
+
+    await db
+      .collection("Dataset")
+      .updateMany({}, { $unset: { principalInvestigators: "" } });
+  },
+};