refactoring 2 actions

Author: forman

dashi/src/actions/hidePanel.ts

@@ -1,11 +1,5 @@
-import appStore, { ContribPoint } from "../store/appStore";
-import { updateContributionState } from "./updateContributionState";
+import { setComponentVisibility } from "./setComponentVisibility";
 
 export function hidePanel(panelIndex: number) {
-  const contribPoint: ContribPoint = "panels";
-  const panelStates =
-    appStore.getState().contributionStatesRecord[contribPoint];
-  if (panelStates && panelStates[panelIndex].visible) {
-    updateContributionState(contribPoint, panelIndex, { visible: false });
-  }
+  setComponentVisibility("panels", panelIndex, false);
 }

dashi/src/actions/setComponentVisibility.ts

@@ -0,0 +1,57 @@
+import appStore, { ContribPoint } from "../store/appStore";
+import fetchApiResult from "../utils/fetchApiResult";
+import { fetchComponentModel } from "../api";
+import { updateContributionState } from "./updateContributionState";
+
+export function setComponentVisibility(
+  contribPoint: ContribPoint,
+  panelIndex: number,
+  visible: boolean,
+) {
+  const getState = appStore.getState;
+  const contributionStates = getState().contributionStatesRecord[contribPoint];
+  const contributionState = contributionStates[panelIndex];
+  if (contributionState.visible === visible) {
+    return; // nothing to do
+  }
+  if (contributionState.componentModelResult.status) {
+    updateContributionState(contribPoint, panelIndex, { visible });
+  } else {
+    // No status yet, so we must load the component
+    updateContributionState(contribPoint, panelIndex, {
+      visible,
+      componentModelResult: { status: "pending" },
+    });
+    const inputValues = getLayoutInputValues(contribPoint, panelIndex);
+    fetchApiResult(
+      fetchComponentModel,
+      contribPoint,
+      panelIndex,
+      inputValues,
+    ).then((componentModelResult) => {
+      updateContributionState(contribPoint, panelIndex, {
+        componentModelResult,
+      });
+    });
+  }
+}
+
+function getLayoutInputValues(
+  contribPoint: ContribPoint,
+  contribIndex: number,
+): unknown[] {
+  const contributionModels =
+    appStore.getState().contributionsRecordResult.data![contribPoint];
+  const contributionModel = contributionModels[contribIndex];
+  const inputs = contributionModel.layout!.inputs;
+  if (inputs && inputs.length > 0) {
+    // TODO: get inputValue from sources specified by input.kind.
+    //    For time being we use null as it is JSON-serializable
+    return inputs.map((input) => {
+      console.warn(`layout input not supported yet`, input);
+      return null;
+    });
+  } else {
+    return [];
+  }
+}

dashi/src/actions/showPanel.ts

@@ -1,55 +1,5 @@
-import appStore, { ContribPoint } from "../store/appStore";
-import fetchApiResult from "../utils/fetchApiResult";
-import { fetchComponentModel } from "../api";
-import { updateContributionState } from "./updateContributionState";
+import { setComponentVisibility } from "./setComponentVisibility";
 
 export function showPanel(panelIndex: number) {
-  const contribPoint = "panels";
-  const getState = appStore.getState;
-  const panelStates = getState().contributionStatesRecord[contribPoint];
-  const panelState = panelStates[panelIndex];
-  if (panelState.visible) {
-    return; // nothing to do
-  }
-  if (panelState.componentModelResult.status) {
-    // If we have some status, the component is loaded or is being loaded
-    updateContributionState(contribPoint, panelIndex, { visible: true });
-  } else {
-    // No status yet, so we must load the component
-    updateContributionState(contribPoint, panelIndex, {
-      visible: true,
-      componentModelResult: { status: "pending" },
-    });
-    const inputValues = getLayoutInputValues(contribPoint, panelIndex);
-    fetchApiResult(
-      fetchComponentModel,
-      contribPoint,
-      panelIndex,
-      inputValues,
-    ).then((componentModelResult) => {
-      updateContributionState(contribPoint, panelIndex, {
-        componentModelResult,
-      });
-    });
-  }
-}
-
-function getLayoutInputValues(
-  contribPoint: ContribPoint,
-  contribIndex: number,
-): unknown[] {
-  const contributionModels =
-    appStore.getState().contributionsRecordResult.data![contribPoint];
-  const contributionModel = contributionModels[contribIndex];
-  const inputs = contributionModel.layout!.inputs;
-  if (inputs && inputs.length > 0) {
-    // TODO: get inputValue from sources specified by input.kind.
-    //    For time being we use null as it is JSON-serializable
-    return inputs.map((input) => {
-      console.warn(`layout input not supported yet`, input);
-      return null;
-    });
-  } else {
-    return [];
-  }
+  setComponentVisibility("panels", panelIndex, true);
 }