fix(persistence-service): update global environment variables schema (#3829)

This commit is contained in:
James George
2024-02-15 21:40:31 +05:30
committed by GitHub
parent fc34871dae
commit dfdd44b4ed
2 changed files with 18 additions and 34 deletions

View File

@@ -628,7 +628,7 @@ export class PersistenceService extends Service {
private setupGlobalEnvsPersistence() {
const globalEnvKey = "globalEnv"
let globalEnvData: Environment["variables"] = JSON.parse(
let globalEnvData: z.infer<typeof GLOBAL_ENV_SCHEMA> = JSON.parse(
window.localStorage.getItem(globalEnvKey) || "[]"
)
@@ -644,7 +644,7 @@ export class PersistenceService extends Service {
)
}
setGlobalEnvVariables(globalEnvData)
setGlobalEnvVariables(globalEnvData as Environment["variables"])
globalEnv$.subscribe((vars) => {
window.localStorage.setItem(globalEnvKey, JSON.stringify(vars))

View File

@@ -229,24 +229,24 @@ export const MQTT_REQUEST_SCHEMA = z.nullable(
.strict()
)
export const GLOBAL_ENV_SCHEMA = z.union([
z.array(z.never()),
z.array(
z.union([
z.object({
key: z.string(),
secret: z.literal(true),
}),
z.object({
key: z.string(),
value: z.string(),
secret: z.literal(false),
}),
])
),
const EnvironmentVariablesSchema = z.union([
z.object({
key: z.string(),
value: z.string(),
secret: z.literal(false),
}),
z.object({
key: z.string(),
secret: z.literal(true),
}),
z.object({
key: z.string(),
value: z.string(),
}),
])
export const GLOBAL_ENV_SCHEMA = z.array(EnvironmentVariablesSchema)
const OperationTypeSchema = z.enum([
"subscription",
"query",
@@ -364,22 +364,6 @@ const HoppTestDataSchema = z.lazy(() =>
.strict()
)
const EnvironmentVariablesSchema = z.union([
z.object({
key: z.string(),
value: z.string(),
secret: z.literal(false),
}),
z.object({
key: z.string(),
secret: z.literal(true),
}),
z.object({
key: z.string(),
value: z.string(),
}),
])
export const SECRET_ENVIRONMENT_VARIABLE_SCHEMA = z.union([
z.object({}).strict(),