Skip to content

fix(designer): Revert of Reset id replacements when reset designer dirty state #7209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 8, 2025
Merged

fix(designer): Revert of Reset id replacements when reset designer dirty state #7209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b96dfa7
filtering fixes
Eric-B-Wu May 5, 2025
cafad06
Merge branch 'hotfix/v5.94' of https://github.com/Azure/LogicAppsUX i…
Eric-B-Wu May 8, 2025
1cb86fd
:revert "fix(designer): Reset id replacements when reset designer dir…
Eric-B-Wu May 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 1 addition & 14 deletions apps/Standalone/src/designer/app/AzureLogicAppsDesigner/DesignerCommandBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import {
RUN_AFTER_COLORS,
ChatbotService,
WorkflowService,
isNullOrUndefined,
} from '@microsoft/logic-apps-shared';
import type { AppDispatch, CustomCodeFileNameMapping, RootState, Workflow } from '@microsoft/logic-apps-designer';
import {
Expand Down Expand Up @@ -78,7 +77,6 @@ export const DesignerCommandBar = ({
saveWorkflowFromCode,
toggleMonitoringView,
selectRun,
setWorkflow,
}: {
id: string;
location: string;
Expand All @@ -98,7 +96,6 @@ export const DesignerCommandBar = ({
saveWorkflowFromCode: (clearDirtyState: () => void) => void;
toggleMonitoringView: () => void;
selectRun?: (runId: string) => void;
setWorkflow: React.Dispatch<React.SetStateAction<Workflow>>;
}) => {
const dispatch = useDispatch<AppDispatch>();
const isCopilotReady = useNodesInitialized();
Expand Down Expand Up @@ -137,17 +134,7 @@ export const DesignerCommandBar = ({
const customCodeFilesWithData = getCustomCodeFilesWithData(designerState.customCode);

if (!hasParametersErrors) {
const clearDirtyState = () => {
dispatch(resetDesignerDirtyState(undefined));
const savedSerialized = serializedWorkflow as Workflow;
if (!isNullOrUndefined(savedSerialized)) {
setWorkflow((prevState) => ({
...prevState,
definition: savedSerialized.definition,
}));
}
};
await saveWorkflow(serializedWorkflow, customCodeFilesWithData, clearDirtyState);
await saveWorkflow(serializedWorkflow, customCodeFilesWithData, () => dispatch(resetDesignerDirtyState(undefined)));
if (Object.keys(serializedWorkflow?.definition?.triggers ?? {}).length > 0) {
updateCallbackUrl(designerState, dispatch);
}
Expand Down
1 change: 0 additions & 1 deletion apps/Standalone/src/designer/app/AzureLogicAppsDesigner/laDesigner.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,6 @@ const DesignerEditor = () => {
}}
switchViews={handleSwitchView}
saveWorkflowFromCode={saveWorkflowFromCode}
setWorkflow={setWorkflow}
/>
{designerView ? <Designer /> : <CodeViewEditor ref={codeEditorRef} workflowKind={workflow?.kind} />}
<CombineInitializeVariableDialog />
Expand Down
3 changes: 1 addition & 2 deletions libs/designer/src/lib/core/state/global.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { resetCustomCode } from './customcode/customcodeSlice';
import { useIsWorkflowDirty } from './workflow/workflowSelectors';
import { resetIdReplacements, setIsWorkflowDirty } from './workflow/workflowSlice';
import { setIsWorkflowDirty } from './workflow/workflowSlice';
import { setIsWorkflowParametersDirty } from './workflowparameters/workflowparametersSlice';
import { useIsWorkflowParametersDirty } from './workflowparameters/workflowparametersselector';
import { createAction, createAsyncThunk } from '@reduxjs/toolkit';
Expand All @@ -22,5 +22,4 @@ export const resetDesignerDirtyState = createAsyncThunk('resetDesignerDirtyState
dispatch(setIsWorkflowDirty(false));
dispatch(setIsWorkflowParametersDirty(false));
dispatch(resetCustomCode());
dispatch(resetIdReplacements());
});
5 changes: 0 additions & 5 deletions libs/designer/src/lib/core/state/workflow/workflowSlice.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -671,10 +671,6 @@ export const workflowSlice = createSlice({
}
state.hostData.errorMessages[action.payload.level] = action.payload.errorMessages;
},
// on save we want to remove all id replacements
resetIdReplacements: (state) => {
state.idReplacements = {};
},
},
extraReducers: (builder) => {
// Add reducers for additional action types here, and handle loading state as needed
Expand Down Expand Up @@ -774,7 +770,6 @@ export const {
updateAgenticMetadata,
setFocusElement,
clearFocusElement,
resetIdReplacements,
} = workflowSlice.actions;

export default workflowSlice.reducer;
Loading