mv: function into common

packages/bruno-app/src/components/SingleLineEditor/index.js

@@ -83,7 +83,7 @@ class SingleLineEditor extends Component {
         }
       });
     }
-    this.editor.setValue(String(this.props.value) || '');
+    this.editor.setValue(String(this.props.value || ''));
     this.editor.on('change', this._onEdit);
     this.addOverlay(variables);
     this._enableMaskedEditor(this.props.isSecret);
@@ -129,7 +129,7 @@ class SingleLineEditor extends Component {
     }
     if (this.props.value !== prevProps.value && this.props.value !== this.cachedValue && this.editor) {
       this.cachedValue = String(this.props.value);
-      this.editor.setValue(String(this.props.value) || '');
+      this.editor.setValue(String(this.props.value || ''));
     }
     if (!isEqual(this.props.isSecret, prevProps.isSecret)) {
       // If the secret flag has changed, update the editor to reflect the change

packages/bruno-electron/src/store/env-secrets.js

@@ -1,6 +1,7 @@
 const _ = require('lodash');
 const Store = require('electron-store');
 const { encryptString } = require('../utils/encryption');
+const { isValidValue } = require('../utils/common');
 
 /**
  * Sample secrets store file
@@ -27,17 +28,13 @@ class EnvironmentSecretsStore {
     });
   }
 
-  isValidValue(val) {
-    return typeof val === 'string' && val.length >= 0;
-  }
-
   storeEnvSecrets(collectionPathname, environment) {
     const envVars = [];
     _.each(environment.variables, (v) => {
       if (v.secret) {
         envVars.push({
           name: v.name,
-          value: this.isValidValue(v.value) ? encryptString(v.value) : ''
+          value: isValidValue(v.value) ? encryptString(v.value) : ''
         });
       }
     });

packages/bruno-electron/src/store/global-environments.js

@@ -1,6 +1,7 @@
 const _ = require('lodash');
 const Store = require('electron-store');
 const { encryptString, decryptString } = require('../utils/encryption');
+const { isValidValue } = require('../utils/common');
 
 class GlobalEnvironmentsStore {
   constructor() {
@@ -10,15 +11,11 @@ class GlobalEnvironmentsStore {
     });
   }
 
-  isValidValue(val) {
-    return typeof val === 'string' && val.length >= 0;
-  }
-
   encryptGlobalEnvironmentVariables({ globalEnvironments }) {
     return globalEnvironments?.map(env => {
       const variables = env.variables?.map(v => ({
         ...v,
-        value: v?.secret ? (this.isValidValue(v.value) ? encryptString(v.value) : '') : v?.value
+        value: v?.secret ? (isValidValue(v.value) ? encryptString(v.value) : '') : v?.value
       })) || [];
 
       return {
@@ -32,7 +29,7 @@ class GlobalEnvironmentsStore {
     return globalEnvironments?.map(env => {
       const variables = env.variables?.map(v => ({
         ...v,
-        value: v?.secret ? (this.isValidValue(v.value) ? decryptString(v.value) : '') : v?.value
+        value: v?.secret ? (isValidValue(v.value) ? decryptString(v.value) : '') : v?.value
       })) || [];
 
       return {

packages/bruno-electron/src/utils/common.js

@@ -137,6 +137,10 @@ const parseDataFromRequest = (request) => {
   return parseDataFromResponse(requestCopy);
 };
 
+const isValidValue = (val) => {
+  return typeof val === 'string' && val.length > 0;
+}
+
 module.exports = {
   uuid,
   stringifyJson,
@@ -147,5 +151,6 @@ module.exports = {
   generateUidBasedOnHash,
   flattenDataForDotNotation,
   parseDataFromResponse,
-  parseDataFromRequest
+  parseDataFromRequest,
+  isValidValue
 };

packages/bruno-electron/tests/utils/env-secrets.spec.js

@@ -0,0 +1,17 @@
+const { isValidValue } = require('../../src/utils/common');
+
+describe('isValidValue', () => {
+    it('should return true for valid string values', () => {
+      expect(isValidValue('test')).toBe(true);
+      expect(isValidValue('')).toBe(false);
+    });
+
+    it('should return false for non-string values', () => {
+      expect(isValidValue(null)).toBe(false);
+      expect(isValidValue(undefined)).toBe(false);
+      expect(isValidValue(123)).toBe(false);
+      expect(isValidValue({})).toBe(false);
+      expect(isValidValue([])).toBe(false);
+      expect(isValidValue(true)).toBe(false);
+    });
+}); 

packages/bruno-lang/v2/src/envToJson.js

@@ -68,7 +68,7 @@ const mapArrayListToKeyValPairs = (arrayList = []) => {
 
     return {
       name,
-      value: null,
+      value: '',
       enabled
     };
   });

packages/bruno-lang/v2/tests/envToJson.spec.js

@@ -185,7 +185,7 @@ vars:secret [
         },
         {
           name: 'token',
-          value: null,
+          value: '',
           enabled: true,
           secret: true
         }
@@ -220,19 +220,19 @@ vars:secret [
         },
         {
           name: 'access_token',
-          value: null,
+          value: '',
           enabled: true,
           secret: true
         },
         {
           name: 'access_secret',
-          value: null,
+          value: '',
           enabled: true,
           secret: true
         },
         {
           name: 'access_password',
-          value: null,
+          value: '',
           enabled: false,
           secret: true
         }
@@ -262,7 +262,7 @@ vars:secret [access_key]
         },
         {
           name: 'access_key',
-          value: null,
+          value: '',
           enabled: true,
           secret: true
         }
@@ -292,19 +292,19 @@ vars:secret [access_key,access_secret,    access_password  ]
         },
         {
           name: 'access_key',
-          value: null,
+          value: '',
           enabled: true,
           secret: true
         },
         {
           name: 'access_secret',
-          value: null,
+          value: '',
           enabled: true,
           secret: true
         },
         {
           name: 'access_password',
-          value: null,
+          value: '',
           enabled: true,
           secret: true
         }