starred/yaak
1
0
Fork 0
mirror of https://github.com/mountain-loop/yaak.git synced 2026-03-18 23:44:12 +01:00
Code Issues 8 Packages Projects Releases 10 Wiki Activity

Filter out current variable from autocomplete and show sub environment variables in base environment autocomplete

Browse Source
This commit is contained in:
Gregory Schier
2025-09-29 06:57:04 -07:00
parent b9613591f8
commit 6abbdc8726
6 changed files with 41 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src-web/hooks/useEnvironmentVariables.ts
View File

@@ -3,7 +3,7 @@ import { foldersAtom } from '@yaakapp-internal/models';
import { useAtomValue } from 'jotai';
import { useMemo } from 'react';
import { jotaiStore } from '../lib/jotai';
import { isFolderEnvironment } from '../lib/model_util';
import { isBaseEnvironment, isFolderEnvironment } from '../lib/model_util';
import { useActiveEnvironment } from './useActiveEnvironment';
import { useActiveRequest } from './useActiveRequest';
import { useEnvironmentsBreakdown } from './useEnvironmentsBreakdown';
@@ -24,11 +24,13 @@ export function useEnvironmentVariables(targetEnvironmentId: string | null) {
wrapVariables(folderEnvironments.find((fe) => fe.parentId === f.id) ?? null),
);
// Folder environments also can auto-complete from the active environment
// Add active environment variables to everything except sub environments
const activeEnvironmentVariables =
targetEnvironment == null || isFolderEnvironment(targetEnvironment)
targetEnvironment == null || // Editing request
isFolderEnvironment(targetEnvironment) || // Editing folder variables
isBaseEnvironment(targetEnvironment) // Editing global variables
? wrapVariables(activeEnvironment)
: [];
: wrapVariables(targetEnvironment); // Add own variables for sub environments
const allVariables = [
...folderVariables,