Merge pull request #570 from Theodo-UK/fix-all-resource-table-bug

Author: mansurpasha

src/CLIMain.js

@@ -7,7 +7,7 @@ import {
 } from "./constants";
 
 import { Map } from "./components";
-import { ResourceTable } from "./components/resourceTable";
+import { ResourceTable } from "./components/resourceTableComponent/resourceTable";
 import { DurationBarChart } from "./components/durationBarChart";
 import { getLambdaMetrics } from "./services/lambdaMetrics";
 import {

src/components/resourceTable.js src/components/resourceTableComponent/resourceTable.js

@@ -1,13 +1,15 @@
+import { DASHBOARD_FOCUS_INDEX, DEPLOYMENT_STATUS } from "../../constants";
 import {
-  DEPLOYMENT_STATUS,
+  RESOURCE_TABLE_CONFIG,
   RESOURCE_TABLE_TYPE,
-  DASHBOARD_FOCUS_INDEX,
-} from "../constants";
-import { getStackResources } from "../services/stackResources";
-import { padString } from "../utils/padString";
-import { lambdaStatisticsModal, lambdaInvokeModal } from "../modals";
-import { getLambdaFunctions } from "../services";
-import { abbreviateFunction } from "../utils/abbreviateFunction";
+  switchTableConfig,
+} from "./resourceTableConfig";
+import { lambdaInvokeModal, lambdaStatisticsModal } from "../../modals";
+
+import { abbreviateFunction } from "../../utils/abbreviateFunction";
+import { getLambdaFunctions } from "../../services";
+import { getStackResources } from "../../services/stackResources";
+import { padString } from "../../utils/padString";
 
 const contrib = require("blessed-contrib");
 const open = require("open");
@@ -154,14 +156,10 @@ class ResourceTable {
   switchTable() {
     switch (this.type) {
       case RESOURCE_TABLE_TYPE.LAMBDA:
-        this.type = RESOURCE_TABLE_TYPE.ALL_RESOURCES;
-        this.table.setLabel("<-           All Resources          ->");
-        this.table.options.columnWidth = [50, 30];
+        switchTableConfig(this, RESOURCE_TABLE_TYPE.ALL_RESOURCES);
         break;
       case RESOURCE_TABLE_TYPE.ALL_RESOURCES:
-        this.type = RESOURCE_TABLE_TYPE.LAMBDA;
-        this.table.setLabel("<-         Lambda Functions         ->");
-        this.table.options.columnWidth = [30, 30, 10, 10, 20];
+        switchTableConfig(this, RESOURCE_TABLE_TYPE.LAMBDA);
         break;
       default:
         return 0;
@@ -173,9 +171,10 @@ class ResourceTable {
     return this.application.layoutGrid.set(0, 6, 4, 6, contrib.table, {
       keys: true,
       fg: "green",
-      label: "<-         Lambda Functions         ->",
+      label: RESOURCE_TABLE_CONFIG[RESOURCE_TABLE_TYPE.LAMBDA].label,
       columnSpacing: 1,
-      columnWidth: [30, 30, 10, 10, 20, 10],
+      columnWidth:
+        RESOURCE_TABLE_CONFIG[RESOURCE_TABLE_TYPE.LAMBDA].columnWidth,
       style: {
         border: {
           fg: "yellow",
@@ -206,8 +205,7 @@ class ResourceTable {
   async updateData() {
     const stackResources = await getStackResources(
       this.program.stackName,
-      this.cloudformation,
-      this.application.setData
+      this.cloudformation
     );
 
     if (stackResources) {

src/components/resourceTableComponent/resourceTableConfig.js

@@ -0,0 +1,23 @@
+export const RESOURCE_TABLE_TYPE = {
+  LAMBDA: "LAMBDA",
+  ALL_RESOURCES: "ALL_RESOURCES",
+};
+
+export const RESOURCE_TABLE_CONFIG = {
+  [RESOURCE_TABLE_TYPE.LAMBDA]: {
+    label: "<-         Lambda Functions         ->",
+    columnWidth: [30, 30, 10, 10, 20, 10],
+  },
+  [RESOURCE_TABLE_TYPE.ALL_RESOURCES]: {
+    label: "<-           All Resources          ->",
+    columnWidth: [50, 30],
+  },
+};
+
+export const switchTableConfig = (application, tableType) => {
+  application.type = tableType;
+  application.table.setLabel(RESOURCE_TABLE_CONFIG[tableType].label);
+  application.options.columnWidth =
+    RESOURCE_TABLE_CONFIG[tableType].columnWidth;
+  this.table.options.columnWidth = [30, 30, 10, 10, 20, 10];
+};

src/constants.js

@@ -34,11 +34,6 @@ export const DEPLOYMENT_STATUS = {
   ERROR: "ERROR",
 };
 
-export const RESOURCE_TABLE_TYPE = {
-  LAMBDA: "LAMBDA",
-  ALL_RESOURCES: "ALL_RESOURCES",
-};
-
 export const DASHBOARD_FOCUS_INDEX = {
   RESOURCE_TABLE: 0,
   EVENT_BRIDGE_TREE: 1,