Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
hpc-team
strudelv2_spa
Commits
61f20c65
Commit
61f20c65
authored
May 19, 2021
by
Chris Hines
Browse files
fixes for loading the app catalog from a user provided config file
parent
31848db3
Changes
3
Hide whitespace changes
Inline
Side-by-side
package.json
View file @
61f20c65
...
...
@@ -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 ."
,
...
...
src/app/computesites.service.ts
View file @
61f20c65
...
...
@@ -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
)
{
...
...
src/app/identity.ts
View file @
61f20c65
...
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment