Skip to content

Commit 0d682af

Browse files
committed
Using new ApiOptions
1 parent b070a97 commit 0d682af

File tree

4 files changed

+10
-7
lines changed

4 files changed

+10
-7
lines changed

dashi/src/state/system.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@ import { ContribPoint, Contributions, Extension } from "@/model/extension";
22
import { Contribution } from "@/model/contribution";
33
import { ApiResult } from "@/utils/fetchApiResult";
44
import { ContributionState } from "./contribution";
5+
import { ApiOptions } from "@/api";
56

67
export interface SystemState {
8+
apiOptions?: ApiOptions;
79
// API call result GET /contributions
810
contributionsResult: ApiResult<Contributions>;
911
// All extensions

dashi/src/store/actions/applyPropertyChange.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export default function applyPropertyChange(
2525
contribIndex: number,
2626
contribEvent: PropertyChangeEvent,
2727
) {
28-
const { contributionModelsRecord, contributionStatesRecord } =
28+
const { apiOptions, contributionModelsRecord, contributionStatesRecord } =
2929
systemStore.getState();
3030
const contributionModels = contributionModelsRecord[contribPoint];
3131
const contributionStates = contributionStatesRecord[contribPoint];
@@ -61,7 +61,7 @@ export default function applyPropertyChange(
6161
...callbackRef,
6262
}),
6363
);
64-
fetchApiResult(fetchStateChangeRequests, callbackRequests).then(
64+
fetchApiResult(fetchStateChangeRequests, callbackRequests, apiOptions).then(
6565
(changeRequestsResult) => {
6666
const secondaryChangeRequests = changeRequestsResult.data;
6767
if (secondaryChangeRequests) {

dashi/src/store/actions/initSystemStore.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import systemStore from "@/store/system";
22
import fetchApiResult from "@/utils/fetchApiResult";
3-
import { fetchContributions } from "@/api";
3+
import { ApiOptions, fetchContributions } from "@/api";
44
import { Contribution } from "@/model/contribution";
55
import { ContributionState } from "@/state/contribution";
66
import { ContribPoint } from "@/model/extension";
77

8-
export function initSystemStore() {
8+
export function initSystemStore(apiOptions?: ApiOptions) {
99
const set = systemStore.setState;
1010

11-
set({ contributionsResult: { status: "pending" } });
12-
fetchApiResult(fetchContributions).then((contributionsResult) => {
11+
set({ apiOptions, contributionsResult: { status: "pending" } });
12+
fetchApiResult(fetchContributions, apiOptions).then((contributionsResult) => {
1313
// TODO: assert Boolean(contributionsResult.data)
1414
const { extensions, contributions: contributionModelsRecord } =
1515
contributionsResult.data!;

dashi/src/store/actions/setComponentVisibility.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export function setComponentVisibility(
1010
panelIndex: number,
1111
visible: boolean,
1212
) {
13-
const { contributionStatesRecord } = systemStore.getState();
13+
const { apiOptions, contributionStatesRecord } = systemStore.getState();
1414
const contributionStates = contributionStatesRecord[contribPoint];
1515
const contributionState = contributionStates[panelIndex];
1616
if (contributionState.visible === visible) {
@@ -30,6 +30,7 @@ export function setComponentVisibility(
3030
contribPoint,
3131
panelIndex,
3232
inputValues,
33+
apiOptions,
3334
).then((componentModelResult) => {
3435
const componentState = componentModelResult?.data;
3536
updateContributionState(contribPoint, panelIndex, {

0 commit comments

Comments
 (0)