mirror of
https://github.com/mountain-loop/yaak.git
synced 2026-03-26 19:31:12 +01:00
Extract base environment (#149)
This commit is contained in:
@@ -1,16 +1,16 @@
|
||||
import type { EnvironmentVariable } from '@yaakapp-internal/models';
|
||||
import { useMemo } from 'react';
|
||||
import { useActiveEnvironment } from './useActiveEnvironment';
|
||||
import { useActiveWorkspace } from './useActiveWorkspace';
|
||||
import { useEnvironments } from './useEnvironments';
|
||||
|
||||
export function useActiveEnvironmentVariables() {
|
||||
const workspace = useActiveWorkspace();
|
||||
const { baseEnvironment } = useEnvironments();
|
||||
const [environment] = useActiveEnvironment();
|
||||
|
||||
const variables = useMemo(() => {
|
||||
const varMap: Record<string, EnvironmentVariable> = {};
|
||||
|
||||
const allVariables = [...(workspace?.variables ?? []), ...(environment?.variables ?? [])];
|
||||
const allVariables = [...(baseEnvironment?.variables ?? []), ...(environment?.variables ?? [])];
|
||||
|
||||
for (const v of allVariables) {
|
||||
if (!v.enabled || !v.name) continue;
|
||||
@@ -18,7 +18,7 @@ export function useActiveEnvironmentVariables() {
|
||||
}
|
||||
|
||||
return Object.values(varMap);
|
||||
}, [workspace, environment]);
|
||||
}, [baseEnvironment?.variables, environment?.variables]);
|
||||
|
||||
return variables;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user