Commit 61f20c65 authored by Chris Hines's avatar Chris Hines
Browse files

fixes for loading the app catalog from a user provided config file

parent 31848db3
......@@ -29,7 +29,7 @@
"build": "npm run electron:serve-tsc && ng build --base-href ./",
"build:dev": "npm run build -- -c dev",
"build:prod": "npm run build -- -c production",
"ng:serve": "ng serve -c web -o",
"ng:serve": "ng serve ",
"electron:serve-tsc": "tsc -p tsconfig.serve.json",
"electron:serve": "wait-on tcp:4200 && npm run electron:serve-tsc && npx electron . --serve",
"electron:local": "npm run build:prod && npx electron .",
......
......@@ -193,7 +193,7 @@ export class ComputesitesService {
if (principal != null) {
let id = new Identity(principal,cs,certs[i].expiry);
identities.push(id);
if (cs.appCatalogUri != null || cs.appCatalogCmd != null) {
if (cs.appCatalogUri !== null || cs.appCatalogCmd !== null || cs.appCatalog !== null) {
appidentities.push(id);
}
if (cs.dtn != null ) {
......
......@@ -22,7 +22,12 @@ export class Identity {
this.systemalerts = new BehaviorSubject<Health[]>(null);
this.accountalerts = new BehaviorSubject<Health[]>(null);
this.joblist = new BehaviorSubject<Job[]>([]);
this.appCatalog = new BehaviorSubject<Strudelapp[]>(site.appCatalog);
if (site !== null) {
console.log('creating a site with appCatalog',site.appCatalog);
this.appCatalog = new BehaviorSubject<Strudelapp[]>(site.appCatalog);
} else {
this.appCatalog = new BehaviorSubject<Strudelapp[]>([]);
}
this.quotas = [];
this.expiry = expiry;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment