Skip to content

Commit

Permalink
fix(Templates): Fix Standalone Breaking For Query Provider Issue (#4985)
Browse files Browse the repository at this point in the history
moved reactQueryProvider from standaloneDesigner to app to accomodate query usage
  • Loading branch information
Elaina-Lee committed Jun 17, 2024
1 parent a48f43b commit 325ae34
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 23 deletions.
5 changes: 4 additions & 1 deletion apps/Standalone/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { store as templateStore } from './templates/state/Store';
import { DataMapperStandaloneDesignerV1 } from './dataMapperV1/app/DataMapperStandaloneDesignerV1';
import { DataMapperStandaloneDesignerV2 } from './dataMapperV1/app/DataMapperStandaloneDesignerV2';
import { TemplatesStandaloneDesigner } from './templates/app/TemplatesStandaloneDesigner';
import { ReactQueryProvider } from '@microsoft/logic-apps-designer';

export const App = () => {
return (
Expand Down Expand Up @@ -51,7 +52,9 @@ const DataMapperV2 = () => {
const TemplatesStandalone = () => {
return (
<Provider store={templateStore}>
<TemplatesStandaloneDesigner />
<ReactQueryProvider>
<TemplatesStandaloneDesigner />
</ReactQueryProvider>
</Provider>
);
};
42 changes: 20 additions & 22 deletions apps/Standalone/src/templates/app/TemplatesStandaloneDesigner.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useMemo, type ReactNode } from 'react';
import { ReactQueryProvider, TemplatesDataProvider } from '@microsoft/logic-apps-designer';
import { TemplatesDataProvider } from '@microsoft/logic-apps-designer';
import { environment, loadToken } from '../../environments/environment';
import { DevToolbox } from '../components/DevToolbox';
import type { RootState } from '../state/Store';
Expand Down Expand Up @@ -161,27 +161,25 @@ export const TemplatesStandaloneDesigner = () => {
);
const resourceDetails = new ArmParser(appId ?? '');
return (
<ReactQueryProvider>
<LoadWhenArmTokenIsLoaded>
<DevToolbox />
{workflowAppData ? (
<TemplatesDesignerProvider locale="en-US" theme={theme}>
<TemplatesDataProvider
resourceDetails={{
subscriptionId: resourceDetails.subscriptionId,
resourceGroup: resourceDetails.resourceGroup,
location: canonicalLocation,
}}
services={services}
isConsumption={isConsumption}
existingWorkflowName={existingWorkflowName}
>
<TemplatesDesigner createWorkflowCall={createWorkflowCall} />
</TemplatesDataProvider>
</TemplatesDesignerProvider>
) : null}
</LoadWhenArmTokenIsLoaded>
</ReactQueryProvider>
<LoadWhenArmTokenIsLoaded>
<DevToolbox />
{workflowAppData ? (
<TemplatesDesignerProvider locale="en-US" theme={theme}>
<TemplatesDataProvider
resourceDetails={{
subscriptionId: resourceDetails.subscriptionId,
resourceGroup: resourceDetails.resourceGroup,
location: canonicalLocation,
}}
services={services}
isConsumption={isConsumption}
existingWorkflowName={existingWorkflowName}
>
<TemplatesDesigner createWorkflowCall={createWorkflowCall} />
</TemplatesDataProvider>
</TemplatesDesignerProvider>
) : null}
</LoadWhenArmTokenIsLoaded>
);
};

Expand Down

0 comments on commit 325ae34

Please sign in to comment.