Feature/optimize for golive (#6)

* Added status to reset function * Switching to one-pager * Changed SWA config * Added confirm dialog for delete
aessing · Apr 23, 2021 · b01b38e · b01b38e
1 parent 280dd47
commit b01b38e
Show file tree

Hide file tree

Showing 23 changed files with 13,869 additions and 5,930 deletions.
diff --git a/.prettierrc b/.prettierrc
@@ -1,5 +1,5 @@
 {
-  "printWidth": 120,
+  "printWidth": 80,
   "tabWidth": 2,
   "singleQuote": true,
   "jsxBracketSameLine": true

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -3,7 +3,9 @@
     "ms-azuretools.vscode-azurefunctions",
     "ms-azuretools.vscode-azurestaticwebapps",
     "ms-azuretools.vscode-azurestorage",
-    "ritwickdey.liveserver",
-    "esbenp.prettier-vscode"
+    "ms-azuretools.vscode-logicapps",
+    "dbaeumer.vscode-eslint",
+    "esbenp.prettier-vscode",
+    "ritwickdey.liveserver"
   ]
 }
diff --git a/api/GetTestStatus/function.json → api/GetClasses/function.json b/api/GetTestStatus/function.json → api/GetClasses/function.json
diff --git a/api/GetClasses/index.js b/api/GetClasses/index.js
@@ -0,0 +1,45 @@
+const tableStore = require(`azure-storage`);
+
+module.exports = async function (context, req) {
+  context.res = {
+    status: 200,
+    body: await getTestStatus(),
+    headers: {
+      'Content-Type': 'application/json',
+      'X-Content-Type-Options': 'nosniff',
+    },
+  };
+};
+
+async function getTestStatus() {
+  const tableService = tableStore.createTableService();
+  const statusQuery = new tableStore.TableQuery().select([
+    `PartitionKey`,
+    `Status`,
+  ]);
+
+  return new Promise(function (resolve, reject) {
+    tableService.queryEntities(
+      process.env['STATUSTABLE_NAME'],
+      statusQuery,
+      null,
+      function (error, result) {
+        if (!error) {
+          let entities = result.entries;
+          let resultSet = new Array();
+
+          entities.forEach(function (entity) {
+            resultSet.push({
+              class: entity.PartitionKey._,
+              status: entity.Status._,
+            });
+          });
+
+          resolve(JSON.stringify(resultSet));
+        } else {
+          reject(error.message);
+        }
+      }
+    );
+  });
+}
diff --git a/api/GetTestStatus/index.js b/api/GetTestStatus/index.js
diff --git a/api/RemoveClass/index.js b/api/RemoveClass/index.js
@@ -40,12 +40,16 @@ async function removeClass(testClass) {
   };
 
   return new Promise(function (resolve, reject) {
-    tableService.deleteEntity(process.env['STATUSTABLE_NAME'], updatedStatus, function (error) {
-      if (!error) {
-        resolve(200);
-      } else {
-        reject(500);
+    tableService.deleteEntity(
+      process.env['STATUSTABLE_NAME'],
+      updatedStatus,
+      function (error) {
+        if (!error) {
+          resolve(200);
+        } else {
+          reject(500);
+        }
       }
-    });
+    );
   });
 }
diff --git a/api/SetTestStatus/function.json → api/ResetClasses/function.json b/api/SetTestStatus/function.json → api/ResetClasses/function.json
diff --git a/api/resetTestStatus/index.js → api/ResetClasses/index.js b/api/resetTestStatus/index.js → api/ResetClasses/index.js
@@ -1,12 +1,16 @@
 const tableStore = require(`azure-storage`);
 
 module.exports = async function (context, req) {
-  const authKey = req.query.authkey || (req.body && req.body.authkey);
+  const paramAuthKey = req.query.authkey || (req.body && req.body.authkey);
+  const paramClassStatus = req.query.status || (req.body && req.body.status);
+
+  let classStatus = Number(paramClassStatus) === 3 ? paramClassStatus : 0;
+
   let responseStatus;
 
-  if (process.env['RESET_AUTH_KEY'] === authKey) {
+  if (process.env['RESET_AUTH_KEY'] === paramAuthKey) {
     let classes = await getClasses();
-    responseStatus = await resetTestStatus(classes);
+    responseStatus = await resetTestStatus(classes, classStatus);
   } else {
     responseStatus = 401;
   }
@@ -42,22 +46,27 @@ async function getClasses() {
   const statusQuery = new tableStore.TableQuery().select(`PartitionKey`);
 
   return new Promise(function (resolve) {
-    tableService.queryEntities(process.env['STATUSTABLE_NAME'], statusQuery, null, function (error, result) {
-      if (!error) {
-        let entities = result.entries;
-        let resultSet = new Array();
+    tableService.queryEntities(
+      process.env['STATUSTABLE_NAME'],
+      statusQuery,
+      null,
+      function (error, result) {
+        if (!error) {
+          let entities = result.entries;
+          let resultSet = new Array();
 
-        entities.forEach(function (entity) {
-          resultSet.push(entity.PartitionKey._);
-        });
+          entities.forEach(function (entity) {
+            resultSet.push(entity.PartitionKey._);
+          });
 
-        resolve(resultSet);
+          resolve(resultSet);
+        }
       }
-    });
+    );
   });
 }
 
-async function resetTestStatus(classList) {
+async function resetTestStatus(classList, classStatus) {
   const tableService = tableStore.createTableService();
 
   return new Promise(function (resolve, reject) {
@@ -70,17 +79,23 @@ async function resetTestStatus(classList) {
           _: '',
         },
         Status: {
-          _: 0,
+          _: Number(classStatus),
         },
       };
 
-      tableService.replaceEntity(process.env['STATUSTABLE_NAME'], updatedStatus, function (error) {
-        if (!error) {
-          resolve(200);
-        } else {
-          reject(500);
+      console.log(updatedStatus);
+
+      tableService.replaceEntity(
+        process.env['STATUSTABLE_NAME'],
+        updatedStatus,
+        function (error) {
+          if (!error) {
+            resolve(200);
+          } else {
+            reject(500);
+          }
         }
-      });
+      );
     });
   });
 }
diff --git a/api/resetTestStatus/function.json → api/SetClassStatus/function.json b/api/resetTestStatus/function.json → api/SetClassStatus/function.json
diff --git a/api/SetTestStatus/index.js → api/SetClassStatus/index.js b/api/SetTestStatus/index.js → api/SetClassStatus/index.js
@@ -44,12 +44,16 @@ async function setTestStatus(testClass, testStatus) {
   };
 
   return new Promise(function (resolve, reject) {
-    tableService.insertOrReplaceEntity(process.env['STATUSTABLE_NAME'], updatedStatus, function (error) {
-      if (!error) {
-        resolve(200);
-      } else {
-        reject(500);
+    tableService.insertOrReplaceEntity(
+      process.env['STATUSTABLE_NAME'],
+      updatedStatus,
+      function (error) {
+        if (!error) {
+          resolve(200);
+        } else {
+          reject(500);
+        }
       }
-    });
+    );
   });
 }
diff --git a/web/admin/index.html b/web/admin/index.html