openchs-models 1.33.12 → 1.33.20

package/.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2
 defaults: &defaults
   working_directory: ~/repo
   docker:
-    - image: cimg/node:18.20.8
+    - image: cimg/node:20.19.5
 
 jobs:
   build:
@@ -39,34 +39,31 @@ jobs:
       - persist_to_workspace:
           root: ~/repo
           paths: .
-  publish:
-    <<: *defaults
-    steps:
-      - attach_workspace:
-          at: ~/repo
-      - run:
-          name: Authenticate with registry
-          command: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > ~/repo/.npmrc
-      - run:
-          name: Publish package
-          command: npm publish
+#  publish:
+#    <<: *defaults
+#    steps:
+#      - attach_workspace:
+#          at: ~/repo
+#      - run:
+#          name: Authenticate with registry
+#          command: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > ~/repo/.npmrc
+#      - run:
+#          name: Publish package
+#          command: npm publish
 
 workflows:
   version: 2
   test_deploy:
     jobs:
-      - build:
-          filters:
-            tags:
-              only: /^v.*/
-      - publish:
-          requires:
-            - build
-          filters:
-            tags:
-              only: /^v.*/
-            branches:
-              ignore: /.*/
+      - build
+#      - publish:
+#          requires:
+#            - build
+#          filters:
+#            tags:
+#              only: /^v.*/
+#            branches:
+#              ignore: /.*/
 
 notify:
   webhooks:

package/.github/workflows/publish_to_npm.yml

@@ -0,0 +1,30 @@
+name: Publish Package
+
+on:
+    push:
+        tags:
+            - 'v*'
+
+permissions:
+    id-token: write  # Required for OIDC
+    contents: read
+
+jobs:
+    publish:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v4
+
+            - uses: actions/setup-node@v4
+              with:
+                  node-version: '20'
+                  registry-url: 'https://registry.npmjs.org'
+            - name: Update npm
+              run: npm install -g npm@latest
+            - name: Install yarn
+              run: npm install -g yarn
+            - run: yarn install
+            - run: yarn build
+            - run: yarn validate:schemas
+            - run: yarn test
+            - run: npm publish --verbose

package/.nvmrc

@@ -1 +1 @@
-v18
+v20

package/dist/Schema.js

@@ -177,7 +177,7 @@ function createRealmConfig() {
       return doCompact;
     },
     //order is important, should be arranged according to the dependency
-    schemaVersion: 204,
+    schemaVersion: 205,
     onMigration: function (oldDB, newDB) {
       console.log("[AvniModels.Schema]", `Running migration with old schema version: ${oldDB.schemaVersion} and new schema version: ${newDB.schemaVersion}`);
       if (oldDB.schemaVersion === VersionWithEmbeddedMigrationProblem) throw new Error(`Update from schema version ${VersionWithEmbeddedMigrationProblem} is not allowed. Please uninstall and install app.`);
@@ -760,6 +760,19 @@ function createRealmConfig() {
           }
         });
       }
+      if (oldDB.schemaVersion < 205) {
+        _lodash.default.forEach(newDB.objects("Concept"), concept => {
+          const oldConcept = oldDB.objects("Concept").filtered(`uuid = "${concept.uuid}"`)[0];
+          if (oldConcept && oldConcept.mediaUrl && oldConcept.mediaType) {
+            const conceptMedia = {
+              uuid: _General.default.randomUUID(),
+              url: oldConcept.mediaUrl,
+              type: oldConcept.mediaType
+            };
+            concept.media.push(conceptMedia);
+          }
+        });
+      }
     }
   };
 }

package/package.json

@@ -1,11 +1,11 @@
 {
     "name": "openchs-models",
     "description": "OpenCHS data model to be used by front end clients",
-    "version": "1.33.12",
+    "version": "1.33.20",
     "private": false,
     "repository": {
         "type": "git",
-        "url": "https://github.com/OpenCHS/openchs-models.git"
+        "url": "git+https://github.com/avniproject/avni-models.git"
     },
     "main": "dist/index.js",
     "scripts": {