Merge pull request #256

* Update environment model to get ready for request/folder environments

* Folder environments in UI

* Folder environments working

* Tweaks and fixes

* Tweak environment encryption UX

* Tweak environment encryption UX

* Address comments

* Update fn name

* Add tsc back to lint rules

* Update src-web/components/EnvironmentEditor.tsx

* Merge remote-tracking branch 'origin/folder-environments' into folder…

src-web/components/core/Editor/twig/extension.ts

@@ -2,7 +2,7 @@ import type { LanguageSupport } from '@codemirror/language';
 import { LRLanguage } from '@codemirror/language';
 import type { Extension } from '@codemirror/state';
 import { parseMixed } from '@lezer/common';
-import type { EnvironmentVariable } from '@yaakapp-internal/models';
+import type { WrappedEnvironmentVariable } from '../../../../hooks/useEnvironmentVariables';
 import type { GenericCompletionConfig } from '../genericCompletion';
 import { genericCompletion } from '../genericCompletion';
 import { textLanguage } from '../text/extension';
@@ -21,10 +21,10 @@ export function twig({
   extraExtensions,
 }: {
   base: LanguageSupport;
-  environmentVariables: EnvironmentVariable[];
+  environmentVariables: WrappedEnvironmentVariable[];
   completionOptions: TwigCompletionOption[];
   autocomplete?: GenericCompletionConfig;
-  onClickVariable: (option: EnvironmentVariable, tagValue: string, startPos: number) => void;
+  onClickVariable: (option: WrappedEnvironmentVariable, tagValue: string, startPos: number) => void;
   onClickMissingVariable: (name: string, tagValue: string, startPos: number) => void;
   onClickPathParameter: (name: string) => void;
   extraExtensions: Extension[];
@@ -33,9 +33,11 @@ export function twig({
 
   const variableOptions: TwigCompletionOption[] =
     environmentVariables.map((v) => ({
-      ...v,
+      name: v.variable.name,
+      value: v.variable.value,
       type: 'variable',
-      label: v.name,
+      label: v.variable.name,
+      description: `Inherited from ${v.source}`,
       onClick: (rawTag: string, startPos: number) => onClickVariable(v, rawTag, startPos),
     })) ?? [];
 

src-web/components/core/Editor/twig/templateTags.ts

@@ -94,13 +94,16 @@ function templateTags(
             (o) => o.name === name || (o.type === 'function' && o.aliases?.includes(name)),
           );
           if (option == null) {
+            const from = node.from; // Cache here so the reference doesn't change
             option = {
               invalid: true,
               type: 'variable',
               name: inner,
               value: null,
               label: inner,
-              onClick: () => onClickMissingVariable(name, rawTag, node.from),
+              onClick: () => {
+                onClickMissingVariable(name, rawTag, from);
+              },
             };
           }