renamings after improved typing

Author: forman

dashi/src/actions/handleComponentPropertyChange.ts

@@ -2,7 +2,7 @@ import appStore, { ContribPoint } from "../store/appStore";
 import { PropertyChangeEvent } from "../model/component";
 import { CallbackCallRequest, CallbackCallResult } from "../model/callback";
 import fetchApiResult from "../utils/fetchApiResult";
-import { fetchCallbackOutputs } from "../api";
+import { fetchCallbackCallResults } from "../api";
 
 export default function handleComponentPropertyChange(
   contribPoint: ContribPoint,
@@ -54,7 +54,7 @@ export default function handleComponentPropertyChange(
   });
   console.debug("callRequests", callRequests);
   if (callRequests.length) {
-    fetchApiResult(fetchCallbackOutputs, callRequests).then(
+    fetchApiResult(fetchCallbackCallResults, callRequests).then(
       (callResultResult) => {
         if (callResultResult.data) {
           applyCallbackCallResults(callResultResult.data);

dashi/src/actions/initAppStore.ts

@@ -7,26 +7,26 @@ export function initAppStore() {
   const set = appStore.setState;
 
   set({ extensionsResult: { status: "pending" } });
-  fetchApiResult(fetchExtensions).then((result) => {
-    set({ extensionsResult: result });
+  fetchApiResult(fetchExtensions).then((extensionsResult) => {
+    set({ extensionsResult });
   });
 
   set({ contributionsRecordResult: { status: "pending" } });
-  fetchApiResult(fetchContributionsRecord).then((result) => {
-    if (result.data) {
-      const contributionPointStates: Record<string, ContributionState[]> = {};
-      Object.getOwnPropertyNames(result.data).forEach((contribPoint) => {
-        const contributions: Contribution[] = result.data![contribPoint];
-        contributionPointStates[contribPoint] = contributions.map(() => ({
-          componentModelResult: {},
-        }));
-      });
-      set({
-        contributionsRecordResult: result,
-        contributionStatesRecord: contributionPointStates,
-      });
+  fetchApiResult(fetchContributionsRecord).then((contributionsRecordResult) => {
+    if (contributionsRecordResult.data) {
+      const contributionStatesRecord: Record<string, ContributionState[]> = {};
+      Object.getOwnPropertyNames(contributionsRecordResult.data).forEach(
+        (contribPoint) => {
+          const contributions: Contribution[] =
+            contributionsRecordResult.data![contribPoint];
+          contributionStatesRecord[contribPoint] = contributions.map(() => ({
+            componentModelResult: {},
+          }));
+        },
+      );
+      set({ contributionsRecordResult, contributionStatesRecord });
     } else {
-      set({ contributionsRecordResult: result });
+      set({ contributionsRecordResult });
     }
   });
 }

dashi/src/actions/showPanel.ts

@@ -1,6 +1,6 @@
 import appStore, { ContribPoint } from "../store/appStore";
 import fetchApiResult from "../utils/fetchApiResult";
-import { fetchLayoutComponent } from "../api";
+import { fetchComponentModel } from "../api";
 import { updateContributionState } from "./updateContributionState";
 
 export function showPanel(panelIndex: number) {
@@ -22,7 +22,7 @@ export function showPanel(panelIndex: number) {
     });
     const inputValues = getLayoutInputValues(contribPoint, panelIndex);
     fetchApiResult(
-      fetchLayoutComponent,
+      fetchComponentModel,
       contribPoint,
       panelIndex,
       inputValues,

dashi/src/api.ts

@@ -17,7 +17,7 @@ export async function fetchContributionsRecord(): Promise<
   return callApi(`${serverUrl}/dashi/contributions`);
 }
 
-export async function fetchLayoutComponent(
+export async function fetchComponentModel(
   contribPoint: ContribPoint,
   contribIndex: number,
   inputValues: unknown[],
@@ -28,7 +28,7 @@ export async function fetchLayoutComponent(
   });
 }
 
-export async function fetchCallbackOutputs(
+export async function fetchCallbackCallResults(
   callRequests: CallbackCallRequest[],
 ): Promise<CallbackCallResult[]> {
   return callApi(`${serverUrl}/dashi/callback`, {

dashi/src/app/PanelsControl.tsx

@@ -7,12 +7,12 @@ const contribPoint: ContribPoint = "panels";
 function PanelsControl() {
   const appState = useAppStore();
 
-  const contributionPointsResult = appState.contributionsRecordResult;
-  const contributionPoints = contributionPointsResult.data;
-  if (!contributionPoints) {
+  const contributionsRecordResult = appState.contributionsRecordResult;
+  const contributionsRecord = contributionsRecordResult.data;
+  if (!contributionsRecord) {
     return null;
   }
-  const panelModels = contributionPoints[contribPoint];
+  const panelModels = contributionsRecord[contribPoint];
   const panelStates = appState.contributionStatesRecord[contribPoint];
   if (
     !panelModels ||

dashi/src/app/PanelsRow.tsx

@@ -4,6 +4,8 @@ import useAppStore from "../store/appStore";
 import Panel from "./Panel";
 import handleComponentPropertyChange from "../actions/handleComponentPropertyChange";
 
+const contribPoint = "panels";
+
 function PanelsRow() {
   const appState = useAppStore();
 
@@ -12,8 +14,8 @@ function PanelsRow() {
   let panelElements: ReactElement | null = null;
   const contributionsRecordResult = appState.contributionsRecordResult;
   if (contributionsRecordResult.data) {
-    const panelModels = contributionsRecordResult.data["panels"];
-    const panelStates = appState.contributionStatesRecord["panels"];
+    const panelModels = contributionsRecordResult.data[contribPoint];
+    const panelStates = appState.contributionStatesRecord[contribPoint];
     if (
       !panelModels ||
       !panelStates ||
@@ -32,7 +34,7 @@ function PanelsRow() {
         panelStates[panelIndex],
         panelEvent,
       );
-      handleComponentPropertyChange("panels", panelIndex, panelEvent);
+      handleComponentPropertyChange(contribPoint, panelIndex, panelEvent);
     };
 
     panelElements = (