btwedutech/hoppscotch
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

refactor: ensure empty string IDs fall back to the unique ID variant

Browse Source
This commit is contained in:
jamesgeorge007
2024-03-12 13:27:03 +05:30
committed by Andrew Bastin
parent 5f9f9addaf
commit a3da14d392
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/hoppscotch-common/src/components/environments/my/Details.vue
View File

@@ -331,7 +331,7 @@ watch(
: "variables" : "variables"
if (props.editingEnvironmentIndex !== "Global") { if (props.editingEnvironmentIndex !== "Global") {
editingID.value = workingEnv.value?.id ?? uniqueID() editingID.value = workingEnv.value?.id || uniqueID()
} }
vars.value = pipe( vars.value = pipe(
workingEnv.value?.variables ?? [], workingEnv.value?.variables ?? [],

2
packages/hoppscotch-data/src/environment/index.ts
View File

@@ -165,7 +165,7 @@ export const translateToNewEnvironment = (x: any): Environment => {
if (x.v && x.v === EnvironmentSchemaVersion) return x if (x.v && x.v === EnvironmentSchemaVersion) return x
// Legacy // Legacy
const id = x.id ?? uniqueID() const id = x.id || uniqueID()
const name = x.name ?? "Untitled" const name = x.name ?? "Untitled"
const variables = (x.variables ?? []).map(translateToNewEnvironmentVariables) const variables = (x.variables ?? []).map(translateToNewEnvironmentVariables)

2
packages/hoppscotch-data/src/environment/v/1.ts
View File

@@ -30,7 +30,7 @@ export default defineVersion({
const result: z.infer<typeof V1_SCHEMA> = { const result: z.infer<typeof V1_SCHEMA> = {
...old, ...old,
v: 1, v: 1,
id: old.id ?? uniqueID(), id: old.id || uniqueID(),
variables: old.variables.map((variable) => { variables: old.variables.map((variable) => {
return { return {
...variable, ...variable,