From a8caaca0373d1737bcfab0a885fa5320a4cb13bc Mon Sep 17 00:00:00 2001 From: MatthieuBarbet Date: Wed, 6 Nov 2024 12:41:44 +0100 Subject: [PATCH] Feat:fix display public if connected --- .../components/dynamic-hub/dynamic-hub.component.ts | 9 +++++---- src/settings.yaml | 10 +++++----- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/app/components/dynamic-hub/dynamic-hub.component.ts b/src/app/components/dynamic-hub/dynamic-hub.component.ts index cd2c52d..b2df073 100644 --- a/src/app/components/dynamic-hub/dynamic-hub.component.ts +++ b/src/app/components/dynamic-hub/dynamic-hub.component.ts @@ -232,7 +232,7 @@ export class DynamicHubComponent implements OnInit { this.canCreateDashboardByOrg.set(o, resources.filter(r => r.verb === 'POST').length > 0); this.allowedOrganisations = this.getAllowedOrganisations(); return this.cardService.cardList(fetchOptions) - .pipe(map(cards => this.filterCardsByOrganisation(cards, o, fetchOptions))) + .pipe(map(cards => this.filterCardsByOrganisation(cards, o))) .pipe(tap(cards => this.enrichCards(cards, fetchOptions))); }) ) @@ -267,9 +267,8 @@ export class DynamicHubComponent implements OnInit { }); } - private filterCardsByOrganisation(cards: Card[], o?: string, fetchOptions?) { - this.storeExternalOrganisationsCards(cards.filter(card => card.organisation !== o) - ); + private filterCardsByOrganisation(cards: Card[], o?: string) { + this.storeExternalOrganisationsCards(cards.filter(card => card.organisation !== o)); return cards.filter(card => card.organisation === o); } @@ -289,6 +288,8 @@ export class DynamicHubComponent implements OnInit { if (!publicCards) { publicCards = []; } + this.registerCollection(c); + c.preview$ = this.getPreview$(c.previewId,{}); this.addCard(c, publicCards); this.cardsRef.set(publicOrg, publicCards); } diff --git a/src/settings.yaml b/src/settings.yaml index 23d5a64..c42372c 100644 --- a/src/settings.yaml +++ b/src/settings.yaml @@ -2,11 +2,11 @@ ############ AUTHENTICATION SETTINGS ############### ######################################################## authentication: - use_authent: false - force_connect: true + use_authent: true + force_connect: false use_discovery: true auth_mode: 'iam' - url: 'http://localhost/arlas_iam_server' + url: 'https://localhost/arlas_iam_server' threshold: 60000 scope: openid issuer: http://mgoun/auth/realms/arlas @@ -28,9 +28,9 @@ authentication: sign_up_enabled: true persistence: - url: 'http://localhost:81/persist' + url: 'https://localhost/persist' permission: - url: 'http://localhost:81/permissions' + url: 'https://localhost/arlas_permissions_server' arlas_wui_url: "http://localhost:4200" arlas_builder_url: "http://localhost:4200" links: []