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/responseViewers/CsvViewer.tsx

@@ -10,7 +10,7 @@ interface Props {
 }
 
 export function CsvViewer({ response, className }: Props) {
-  const body = useResponseBodyText(response);
+  const body = useResponseBodyText({ response, filter: null });
 
   const parsed = useMemo(() => {
     if (body.data == null) return null;

src-web/components/responseViewers/HTMLOrTextViewer.tsx

@@ -13,7 +13,7 @@ interface Props {
 }
 
 export function HTMLOrTextViewer({ response, pretty, textViewerClassName }: Props) {
-  const rawTextBody = useResponseBodyText({ responseId: response.id, filter: null });
+  const rawTextBody = useResponseBodyText({ response, filter: null });
   const contentType = getContentTypeFromHeaders(response.headers);
   const language = languageFromContentType(contentType, rawTextBody.data ?? '');
 
@@ -32,7 +32,7 @@ export function HTMLOrTextViewer({ response, pretty, textViewerClassName }: Prop
         text={rawTextBody.data}
         pretty={pretty}
         className={textViewerClassName}
-        responseId={response.id}
+        response={response}
         requestId={response.requestId}
       />
     );

src-web/components/responseViewers/JsonViewer.tsx

@@ -9,7 +9,7 @@ interface Props {
 }
 
 export function JsonViewer({ response, className }: Props) {
-  const rawBody = useResponseBodyText(response);
+  const rawBody = useResponseBodyText({ response, filter: null });
 
   if (rawBody.isLoading || rawBody.data == null) return null;
 

src-web/components/responseViewers/SvgViewer.tsx

@@ -7,7 +7,7 @@ interface Props {
 }
 
 export function SvgViewer({ response }: Props) {
-  const rawTextBody = useResponseBodyText(response);
+  const rawTextBody = useResponseBodyText({ response, filter: null });
   const [src, setSrc] = useState<string | null>(null);
 
   useEffect(() => {

src-web/components/responseViewers/TextViewer.tsx

@@ -1,3 +1,4 @@
+import type { HttpResponse } from '@yaakapp-internal/models';
 import classNames from 'classnames';
 import type { ReactNode } from 'react';
 import { useCallback, useMemo } from 'react';
@@ -18,13 +19,13 @@ interface Props {
   className?: string;
   text: string;
   language: EditorProps['language'];
-  responseId: string;
+  response: HttpResponse;
   requestId: string;
 }
 
 const useFilterText = createGlobalState<Record<string, string | null>>({});
 
-export function TextViewer({ language, text, responseId, requestId, pretty, className }: Props) {
+export function TextViewer({ language, text, response, requestId, pretty, className }: Props) {
   const [filterTextMap, setFilterTextMap] = useFilterText();
   const filterText = filterTextMap[requestId] ?? null;
   const debouncedFilterText = useDebouncedValue(filterText);
@@ -36,7 +37,7 @@ export function TextViewer({ language, text, responseId, requestId, pretty, clas
   );
 
   const isSearching = filterText != null;
-  const filteredResponse = useResponseBodyText({ responseId, filter: debouncedFilterText ?? null });
+  const filteredResponse = useResponseBodyText({ response, filter: debouncedFilterText ?? null });
 
   const toggleSearch = useCallback(() => {
     if (isSearching) {
@@ -69,7 +70,7 @@ export function TextViewer({ language, text, responseId, requestId, pretty, clas
             defaultValue={filterText}
             onKeyDown={(e) => e.key === 'Escape' && toggleSearch()}
             onChange={setFilterText}
-            stateKey={`filter.${responseId}`}
+            stateKey={`filter.${response.id}`}
           />
         </div>,
       );
@@ -96,7 +97,7 @@ export function TextViewer({ language, text, responseId, requestId, pretty, clas
     isSearching,
     language,
     requestId,
-    responseId,
+    response,
     setFilterText,
     toggleSearch,
   ]);

src-web/components/responseViewers/WebPageViewer.tsx

@@ -8,7 +8,7 @@ interface Props {
 
 export function WebPageViewer({ response }: Props) {
   const { url } = response;
-  const body = useResponseBodyText(response).data ?? '';
+  const body = useResponseBodyText({ response, filter: null }).data ?? '';
 
   const contentForIframe: string | undefined = useMemo(() => {
     if (body.includes('<head>')) {