resolve merge conflicts and update description

SciCatProject · Dec 11, 2024 · 41633c9 · 41633c9
2 parents ceae3bb + a16e8e4
commit 41633c9
Show file tree

Hide file tree

Showing 13 changed files with 1,014 additions and 397 deletions.
diff --git a/.env.example b/.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"
diff --git a/.github/workflows/test.yml b/.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
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@
 /dist
 /node_modules
 functionalAccounts.json
+datasetTypes.json
 proposalTypes.json
 loggers.json
 

diff --git a/datasetTypes.example.json b/datasetTypes.example.json
@@ -0,0 +1,3 @@
+{
+  "Custom": "custom"
+}