Merge pull request #90 from ns1labs/feature/ui-ng-environment

feat(ui-env-config): minor improvements on environment config.
orb-community · Aug 10, 2021 · 9f60c97 · 9f60c97
2 parents 80d6845 + 7ddade5
commit 9f60c97
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/ui/src/environments/environment.defaults.ts b/ui/src/environments/environment.defaults.ts
@@ -34,7 +34,7 @@ export const environment = {
     mqttWsUrl: window['env']['mqttWsUrl'] || 'ws://localhost/mqtt',
     exportConfigFile: '/configs/export/config.toml',
     // expose ORB routes and api versioning
-    orbApi: ORB.orbApi,
+    orbApi: {urlKeys: Object.keys(ORB.servicesUrls), ...ORB.orbApi},
     ...ORB.servicesUrls,
   }
 ;
diff --git a/ui/src/environments/environment.prod.ts b/ui/src/environments/environment.prod.ts
@@ -1,14 +1,12 @@
 import { environment as defaultEnvironment } from './environment.defaults';
 
-const {sinksUrl, agentsUrl, agentGroupsUrl, orbApi: {apiUrl, version}} = defaultEnvironment;
+const {orbApi: {apiUrl, version, urlKeys}} = defaultEnvironment;
 
 export const environment = {
   production: true,
 
   ...defaultEnvironment,
   // ORB api --prod
   // override all urls prepend /api/v<#>/<service_url>
-  sinksUrl: `${apiUrl}${version}${sinksUrl}`,
-  agentsUrl: `${apiUrl}${version}${agentsUrl}`,
-  agentGroupsUrl: `${apiUrl}${version}${agentGroupsUrl}`,
+  ...urlKeys.map(key => ({[key]: `${apiUrl}${version}${defaultEnvironment[key]}`})),
 };