npm - @yomotech/view-toolkit - Versions diffs - 0.0.25 → 0.0.27 - Mend

@yomotech/view-toolkit 0.0.25 → 0.0.27

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/fesm2022/yomotech-view-toolkit.mjs +16 -4
package/fesm2022/yomotech-view-toolkit.mjs.map +1 -1
package/package.json +1 -1
package/types/yomotech-view-toolkit.d.ts +1 -1

package/fesm2022/yomotech-view-toolkit.mjs CHANGED Viewed

@@ -365,7 +365,15 @@ class UtilityService {
         }
         else {
             const value = localStorage.getItem(key);
-            return value ? JSON.parse(value) : null;
+            if (value === null) {
+                return null;
+            }
+            try {
+                return JSON.parse(value);
+            }
+            catch {
+                return value;
+            }
         }
     }
     async showAllProjects() {
@@ -2696,9 +2704,11 @@ class ConfigService {
             }
             else {
                 tenantName = await this.utilityService.getStorage('tenantName');
-                selectedTenant = await this.utilityService.getStorage('selectedTenant');
+                selectedTenant = await this.utilityService.getLocalStorage('selectedTenant');
             }
-            this.config = await this.couchdbService.getFileContentFromCouchDb(`${tenantName ? tenantName : selectedTenant}_${projectName}`, 'environments/environment.json');
+            let tenant = tenantName ? tenantName : selectedTenant;
+            console.log('tenant2: ', tenant);
+            this.config = await this.couchdbService.getFileContentFromCouchDb(`${tenant}_${projectName}`, 'environments/environment.json');
             if (this.platform.ANDROID || this.platform.IOS) {
                 if (this.config.environment.login.mobile) {
                     this.setConfiguration(this.config.environment.login.mobile);
@@ -2753,7 +2763,9 @@ class ConfigService {
             tenantName = await this.utilityService.getStorage('tenantName');
             selectedTenant = await this.utilityService.getLocalStorage('selectedTenant');
         }
-        const env = await this.couchdbService.getFileContentFromCouchDb(`${tenantName ? tenantName : selectedTenant}_${projectName}`, 'environments/environment.json');
+        let tenant = tenantName ? tenantName : selectedTenant;
+        console.log('tenant1: ', tenant);
+        const env = await this.couchdbService.getFileContentFromCouchDb(`${tenant}_${projectName}`, 'environments/environment.json');
         if (env?.environment?.login.type === "keycloak") {
             if (this.platform.ANDROID || this.platform.IOS) {
                 this.keycloakConfig = {