fix: xls import was emptying the datasheet before import

Chia-Network · Jun 7, 2022 · cb0a75f · cb0a75f
1 parent 38587cd
commit cb0a75f
Show file tree

Hide file tree

Showing 4 changed files with 1,110 additions and 1,103 deletions.
diff --git a/src/controllers/project.controller.js b/src/controllers/project.controller.js
@@ -221,6 +221,7 @@ export const updateFromXLS = async (req, res) => {
 
     const xlsxParsed = xlsx.parse(files.xlsx.data);
     const stagedDataItems = tableDataFromXlsx(xlsxParsed, Project);
+
     await updateTableWithData(
       collapseTablesData(stagedDataItems, Project),
       Project,

diff --git a/src/utils/data-loaders.js b/src/utils/data-loaders.js
@@ -1,68 +1,68 @@
-import _ from 'lodash';
-
-import request from 'request-promise';
-
-import { Governance } from '../models';
-import PickListStub from '../models/governance/governance.stub.json';
-import { getConfig } from '../utils/config-loader';
-import { logger } from '../config/logger.cjs';
-
-const { USE_SIMULATOR, CHIA_NETWORK } = getConfig().APP;
-const { TESTNET_DEFAULT_ORGANIZATIONS } = getConfig().TESTNET;
-
-let downloadedPickList = {};
-export const getPicklistValues = () => downloadedPickList;
-
-export const pullPickListValues = async () => {
-  if (USE_SIMULATOR) {
-    downloadedPickList = PickListStub;
-  } else {
-    const goveranceData = await Governance.findOne({
-      where: { metaKey: 'pickList' },
-      raw: true,
-    });
-
-    if (_.get(goveranceData, 'metaValue')) {
-      downloadedPickList = JSON.parse(goveranceData.metaValue);
-    }
-  }
-
-  return downloadedPickList;
-};
-
-export const getDefaultOrganizationList = async () => {
-  if (USE_SIMULATOR || CHIA_NETWORK === 'testnet') {
-    const options = {
-      method: 'GET',
-      url: TESTNET_DEFAULT_ORGANIZATIONS,
-    };
-
-    return JSON.parse(await request(Object.assign({}, options)));
-  } else {
-    const goveranceData = await Governance.findOne({
-      where: { metaKey: 'orgList' },
-      raw: true,
-    });
-
-    return JSON.parse(_.get(goveranceData, 'metaValue', '[]'));
-  }
-};
-
-export const serverAvailable = async (server, port) => {
-  const options = {
-    method: 'GET',
-    url: `http://${server}:${port}`,
-  };
-
-  try {
-    await request(Object.assign({}, options));
-    return true;
-  } catch (err) {
-    if (JSON.stringify(err).includes('Python')) {
-      logger.info(`SERVER IS AVAILABLE ${server}`);
-      return true;
-    } else {
-      return false;
-    }
-  }
-};
+import _ from 'lodash';
+
+import request from 'request-promise';
+
+import { Governance } from '../models';
+import PickListStub from '../models/governance/governance.stub.json';
+import { getConfig } from '../utils/config-loader';
+import { logger } from '../config/logger.cjs';
+
+const { USE_SIMULATOR, CHIA_NETWORK } = getConfig().APP;
+const { TESTNET_DEFAULT_ORGANIZATIONS } = getConfig().TESTNET;
+
+let downloadedPickList = {};
+export const getPicklistValues = () => downloadedPickList;
+
+export const pullPickListValues = async () => {
+  if (USE_SIMULATOR || CHIA_NETWORK === 'testnet') {
+    downloadedPickList = PickListStub;
+  } else {
+    const goveranceData = await Governance.findOne({
+      where: { metaKey: 'pickList' },
+      raw: true,
+    });
+
+    if (_.get(goveranceData, 'metaValue')) {
+      downloadedPickList = JSON.parse(goveranceData.metaValue);
+    }
+  }
+
+  return downloadedPickList;
+};
+
+export const getDefaultOrganizationList = async () => {
+  if (USE_SIMULATOR || CHIA_NETWORK === 'testnet') {
+    const options = {
+      method: 'GET',
+      url: TESTNET_DEFAULT_ORGANIZATIONS,
+    };
+
+    return JSON.parse(await request(Object.assign({}, options)));
+  } else {
+    const goveranceData = await Governance.findOne({
+      where: { metaKey: 'orgList' },
+      raw: true,
+    });
+
+    return JSON.parse(_.get(goveranceData, 'metaValue', '[]'));
+  }
+};
+
+export const serverAvailable = async (server, port) => {
+  const options = {
+    method: 'GET',
+    url: `http://${server}:${port}`,
+  };
+
+  try {
+    await request(Object.assign({}, options));
+    return true;
+  } catch (err) {
+    if (JSON.stringify(err).includes('Python')) {
+      logger.info(`SERVER IS AVAILABLE ${server}`);
+      return true;
+    } else {
+      return false;
+    }
+  }
+};