Merge pull request #680 from Chia-Network/develop

release 1.1.3

Author: MichaelTaylor3D

package.json

@@ -1,6 +1,6 @@
 {
   "name": "climate-warehouse",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "private": true,
   "bin": "build/server.js",
   "type": "module",

src/datalayer/persistance.js

@@ -171,7 +171,6 @@ export const getStoreData = async (storeId, rootHash) => {
           `Downloaded Data: ${JSON.stringify(
             data.keys_values.map((record) => {
               return {
-                ...record,
                 key: decodeHex(record.key),
               };
             }),

src/models/file-store/file-store.model.js

@@ -94,7 +94,7 @@ class FileStore extends Model {
     });
 
     return FileStore.findAll({
-      attributes: ['SHA256', 'fileName'],
+      attributes: ['SHA256', 'fileName', 'orgUid'],
       raw: true,
     });
   }

src/models/governance/governance.stub.json

@@ -3,7 +3,7 @@ export const encodeHex = (str) => {
 };
 
 export const decodeHex = (str = '') => {
-  return Buffer.from(str.replace('0x', ''), 'hex').toString();
+  return Buffer.from(str.replace('0x', ''), 'hex').toString('utf8');
 };
 
 export const decodeDataLayerResponse = (data) => {

src/utils/datalayer-utils.js

@@ -1,15 +1,15 @@
-import { getPicklistValues } from './data-loaders';
-
-export const pickListValidation = (field, name) => (value, helper) => {
-  const pickList = getPicklistValues();
-
-  if (pickList[field].includes(value)) {
-    return value;
-  }
-
-  return helper.message(
-    `${name || field} does not include a valid option ${pickList[field].join(
-      ', ',
-    )}`,
-  );
-};
+import { getPicklistValues } from './data-loaders';
+
+export const pickListValidation = (field, name) => (value, helper) => {
+  const pickList = getPicklistValues();
+
+  if (pickList[field].includes(value)) {
+    return value;
+  }
+
+  return helper.message(
+    `${name || field} does not include a valid option ${pickList[field].join(
+      ', ',
+    )} instead got '${value}'`,
+  );
+};

src/utils/validation-utils.js

@@ -19,16 +19,12 @@ export const baseSchema = {
   originProjectId: Joi.alternatives()
     .try(Joi.string(), Joi.number())
     .required(),
-  registryOfOrigin: Joi.alternatives()
-    .try(Joi.string(), Joi.number())
-    .required(),
+  registryOfOrigin: Joi.string().required(),
   program: Joi.string().optional(),
-  projectName: Joi.alternatives().try(Joi.string(), Joi.number()).required(),
-  projectLink: Joi.alternatives().try(Joi.string(), Joi.number()).required(),
-  projectDeveloper: Joi.alternatives()
-    .try(Joi.string(), Joi.number())
-    .required(),
-  sector: Joi.alternatives().try(Joi.string(), Joi.number()).required(),
+  projectName: Joi.string().required(),
+  projectLink: Joi.string().required(),
+  projectDeveloper: Joi.string().required(),
+  sector: Joi.string().required(),
   projectType: Joi.string()
     .custom(pickListValidation('projectType'))
     .required(),
@@ -42,7 +38,7 @@ export const baseSchema = {
     .required(),
   projectStatusDate: Joi.date().required(),
   unitMetric: Joi.string().custom(pickListValidation('unitMetric')).required(),
-  methodology: Joi.alternatives().try(Joi.string(), Joi.number()).required(),
+  methodology: Joi.string().required(),
   methodology2: Joi.string().optional(),
   validationBody: Joi.string()
     .custom(pickListValidation('validationBody'))