#118 - Delete isActive-Flag on variables

EXXETA · Jan 17, 2025 · 5f2963f · 5f2963f
1 parent f9310d8
commit 5f2963f
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 46 deletions.
diff --git a/src/main/environment/service/environment-service.ts b/src/main/environment/service/environment-service.ts
@@ -47,7 +47,7 @@ export class EnvironmentService implements Initializable {
     if (variable !== undefined) {
       variable.value = value;
     } else {
-      this.currentCollection.variables[key] = { key, value, isActive: true };
+      this.currentCollection.variables[key] = { key, value };
     }
   }
 
@@ -59,18 +59,6 @@ export class EnvironmentService implements Initializable {
     this.currentCollection.variables = {};
     variables.forEach((variable) => (this.currentCollection.variables[variable.key] = variable));
   }
-
-  /**
-   * Enables or disables a variable in the current collection.
-   *
-   * @param key The key of the variable.
-   * @param enabled Whether the variable should be enabled or disabled.
-   */
-  public setCollectionVariableEnabled(key: string, enabled: boolean) {
-    const variable = this.currentCollection.variables[key];
-    if (variable !== undefined) variable.isActive = enabled;
-  }
-
   /**
    * Changes the current collection to the one at the specified path.
    *
@@ -84,10 +72,8 @@ export class EnvironmentService implements Initializable {
    * Returns all active variables in the current collection. This also includes system
    * variables.
    */
-  public getActiveVariables() {
-    return Object.values(this.currentCollection.variables)
-      .filter((variable) => variable.isActive)
-      .concat(getSystemVariables());
+  public getVariables() {
+    return Object.values(this.currentCollection.variables).concat(getSystemVariables());
   }
 
   /**

diff --git a/src/main/event/main-event-service.ts b/src/main/event/main-event-service.ts
@@ -95,7 +95,7 @@ export class MainEventService implements IEventService {
   }
 
   async getActiveEnvironmentVariables() {
-    return environmentService.getActiveVariables();
+    return environmentService.getVariables();
   }
 
   async getVariable(key: string) {

diff --git a/src/main/persistence/service/default-collection.ts b/src/main/persistence/service/default-collection.ts
@@ -18,12 +18,10 @@ export function generateDefaultCollection(dirPath: string): Collection {
       [
         {
           key: 'variable1',
-          isActive: true,
           value: 'value-1',
         },
         {
           key: 'variable2',
-          isActive: true,
           value: 'value2',
         },
       ].map((variable) => [variable.key, variable])

diff --git a/src/renderer/components/shared/settings/VariableTab/VariableTab.tsx b/src/renderer/components/shared/settings/VariableTab/VariableTab.tsx
@@ -1,6 +1,6 @@
 import { Divider } from '@/components/shared/Divider';
 import { Button } from '@/components/ui/button';
-import { AddIcon, CheckedIcon, DeleteIcon } from '@/components/icons';
+import { AddIcon, DeleteIcon } from '@/components/icons';
 import {
   Table,
   TableBody,
@@ -9,7 +9,6 @@ import {
   TableHeader,
   TableRow,
 } from '@/components/ui/table';
-import { cn } from '@/lib/utils';
 import { useVariableStore } from '@/state/variableStore';
 
 export const VariableTab = () => {
@@ -78,24 +77,6 @@ export const VariableTab = () => {
                 </TableCell>
                 <TableCell className="w-16 text-right">
                   <div className="flex items-center justify-center gap-2">
-                    <div className="relative h-4 z-10 cursor-pointer">
-                      <input
-                        type="checkbox"
-                        checked={variable.isActive}
-                        onChange={(e) => update(index, e.target.checked, 'isActive')}
-                        className={cn(
-                          'form-checkbox h-4 w-4 appearance-none border rounded-[2px]',
-                          variable.isActive
-                            ? 'border-[rgba(107,194,224,1)] bg-[rgba(25,54,65,1)]'
-                            : 'border-[rgba(238,238,238,1)] bg-transparent'
-                        )}
-                      />
-                      {variable.isActive && (
-                        <div className="absolute left-0 top-0 h-4 w-4 flex items-center justify-center pointer-events-none rotate-6">
-                          <CheckedIcon size={16} viewBox="0 0 16 16" color="rgba(107,194,224,1)" />
-                        </div>
-                      )}
-                    </div>
                     <Button
                       variant="ghost"
                       size="icon"

diff --git a/src/renderer/lib/monaco/template-variable-completion-items-provider.test.ts b/src/renderer/lib/monaco/template-variable-completion-items-provider.test.ts
@@ -30,8 +30,8 @@ const completionItemsProvider = new TemplateVariableCompletionItemsProvider();
 describe('TemplateVariableCompletionItemsProvider', () => {
   // Arrange
   const variables: VariableObject[] = [
-    { key: 'variable', value: '123', isActive: true },
-    { key: '$randomUuid', description: 'Description 2', value: '321', isActive: true },
+    { key: 'variable', value: '123' },
+    { key: '$randomUuid', description: 'Description 2', value: '321' },
   ];
   jest
     .mocked(RendererEventService.instance.getActiveEnvironmentVariables)

diff --git a/src/renderer/state/variableStore.ts b/src/renderer/state/variableStore.ts
@@ -39,7 +39,7 @@ export const useVariableStore = create<VariableState & VariableStateAction>()(
     },
     addNewVariable: () => {
       set((state) => {
-        state.variables.push({ key: '', value: '', description: '', isActive: false });
+        state.variables.push({ key: '', value: '', description: '' });
       });
     },
     deleteVariable: (index: number) => {

diff --git a/src/shim/variables.ts b/src/shim/variables.ts
@@ -11,9 +11,6 @@ export type VariableObject = {
   /** The value of the variable. Might change on each call for dynamic variables */
   value: string;
 
-  /** Whether the variable is active. */
-  isActive: boolean;
-
   /** A description of the variable. */
   description?: string;
 };