Merge develop

Open-Earth-Foundation · Mar 29, 2024 · f161dfa · f161dfa
2 parents 6172dfd + 8fe2247
commit f161dfa
Show file tree

Hide file tree

Showing 51 changed files with 3,029 additions and 673 deletions.
diff --git a/.github/workflows/web-develop.yml b/.github/workflows/web-develop.yml
@@ -3,14 +3,20 @@ name: Push Web app to GHCR and deploy to EKS
 on:
   workflow_dispatch:
   push:
+    branches: ["develop"]
     paths:
       - app/**
       - k8s/cc-migrate.yml
       - k8s/cc-web-deploy.yml
       - k8s/cc-web.yml
       - .github/workflows/web-develop.yml
-    branches: ["develop"]
   pull_request:
+    paths:
+      - app/**
+      - k8s/cc-migrate.yml
+      - k8s/cc-web-deploy.yml
+      - k8s/cc-web.yml
+      - .github/workflows/web-develop.yml
 
 jobs:
   runTests:
@@ -49,22 +55,9 @@ jobs:
       # - name: Run Cypress tests
       #   run: npm run cy:test
 
-      # ... Generate LCOV files or download it from a different job
       - name: Run tests and generate coverage file
         run: npm run ci:test
 
-      # - name: Setup LCOV
-      #   uses: hrishikesh-kadam/setup-lcov@v1
-      # - name: Report code coverage
-      #   uses: zgosalvez/github-actions-report-lcov@v3
-      #   with:
-      #     coverage-files: ./app/lcov*.info
-      #     minimum-coverage: 40
-      #     artifact-name: code-coverage-report
-      #     github-token: ${{ secrets.GITHUB_TOKEN }}
-      #     working-directory: ./app
-      #     update-comment: true
-
       - name: Upload coverage reports to Codecov
         continue-on-error: true
         uses: codecov/codecov-action@v4.0.1

diff --git a/app/migrations/20240329160302-new-catalog.cjs b/app/migrations/20240329160302-new-catalog.cjs
@@ -0,0 +1,79 @@
+"use strict";
+
+/** @type {import('sequelize-cli').Migration} */
+module.exports = {
+  async up(queryInterface, Sequelize) {
+    return queryInterface.sequelize.transaction(async (transaction) => {
+      await queryInterface.addColumn("DataSource", "methodology_description", {
+        type: Sequelize.TEXT,
+        transaction,
+      });
+      await queryInterface.addColumn(
+        "DataSource",
+        "transformation_description",
+        {
+          type: Sequelize.TEXT,
+          transaction,
+        },
+      );
+      await queryInterface.addColumn("DataSource", "dataset_name", {
+        type: Sequelize.TEXT,
+        transaction,
+      });
+      await queryInterface.renameColumn(
+        "DataSource",
+        "name",
+        "datasource_name",
+        {
+          transaction,
+        },
+      );
+      await queryInterface.renameColumn(
+        "DataSource",
+        "description",
+        "dataset_description",
+        {
+          transaction,
+        },
+      );
+    });
+  },
+
+  async down(queryInterface) {
+    return queryInterface.sequelize.transaction(async (transaction) => {
+      await queryInterface.removeColumn(
+        "DataSource",
+        "methodology_description",
+        {
+          transaction,
+        },
+      );
+      await queryInterface.removeColumn(
+        "DataSource",
+        "transformation_description",
+        {
+          transaction,
+        },
+      );
+      await queryInterface.removeColumn("DataSource", "dataset_name", {
+        transaction,
+      });
+      await queryInterface.renameColumn(
+        "DataSource",
+        "datasource_name",
+        "name",
+        {
+          transaction,
+        },
+      );
+      await queryInterface.renameColumn(
+        "DataSource",
+        "dataset_description",
+        "description",
+        {
+          transaction,
+        },
+      );
+    });
+  },
+};