rayan/bruno
1
0
Fork 0
mirror of https://github.com/usebruno/bruno.git synced 2026-06-11 09:51:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: env draft loss on color change and rename (#7130)

Browse Source
This commit is contained in:
Pooja
2026-02-13 16:14:20 +05:30
committed by GitHub
parent 53e158c6d1
commit ac33c909ef
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/bruno-app/src/components/EnvironmentVariablesTable/index.js
View File

@@ -93,6 +93,7 @@ const EnvironmentVariablesTable = ({
}, []);
const prevEnvUidRef = useRef(null);
const prevEnvVariablesRef = useRef(environment.variables);
const mountedRef = useRef(false);
let _collection = collection ? cloneDeep(collection) : {};
@@ -168,11 +169,13 @@ const EnvironmentVariablesTable = ({
useEffect(() => {
const isMount = !mountedRef.current;
const envChanged = prevEnvUidRef.current !== null && prevEnvUidRef.current !== environment.uid;
const variablesReloaded = !isMount && !envChanged && prevEnvVariablesRef.current !== environment.variables;
prevEnvUidRef.current = environment.uid;
prevEnvVariablesRef.current = environment.variables;
mountedRef.current = true;
if ((isMount || envChanged) && hasDraftForThisEnv && draft?.variables) {
if ((isMount || envChanged || variablesReloaded) && hasDraftForThisEnv && draft?.variables) {
formik.setValues([
...draft.variables,
{
@@ -185,7 +188,7 @@ const EnvironmentVariablesTable = ({
}
]);
}
}, [environment.uid, hasDraftForThisEnv, draft?.variables]);
}, [environment.uid, environment.variables, hasDraftForThisEnv, draft?.variables]);
const savedValuesJson = useMemo(() => {
return JSON.stringify((environment.variables || []).map(stripEnvVarUid));

7
packages/bruno-app/src/providers/ReduxStore/slices/global-environments.js
View File

@@ -183,6 +183,13 @@ export const renameGlobalEnvironment = ({ name: newName, environmentUid }) => (d
.invoke('renderer:get-global-environments', { workspaceUid, workspacePath })
.then((data) => {
dispatch(updateGlobalEnvironments(data));
if (resolvedUid !== environmentUid) {
const currentState = getState();
const draft = currentState.globalEnvironments.globalEnvironmentDraft;
if (draft?.environmentUid === environmentUid) {
dispatch(setGlobalEnvironmentDraft({ environmentUid: resolvedUid, variables: draft.variables }));
}
}
return resolvedUid;
});
})

1
packages/bruno-electron/src/ipc/collection.js
View File

@@ -609,6 +609,7 @@ const registerRendererEventHandlers = (mainWindow, watcher) => {
throw new Error(`environment: ${newEnvFilePath} already exists`);
}
moveRequestUid(envFilePath, newEnvFilePath);
fs.renameSync(envFilePath, newEnvFilePath);
environmentSecretsStore.renameEnvironment(collectionPathname, environmentName, newName);