@provoly/dashboard 1.2.7 → 1.2.8

package/fesm2022/provoly-dashboard.mjs

@@ -7429,11 +7429,14 @@ const canManifestBeMadePublic = (manifest, datasets) => {
         return datasource?.groups?.includes(PUBLIC_GROUP) ?? false;
     });
 };
-const getCommonDatasourceGroupsForManifest = (manifest, datasets) => {
+const getCommonDatasourceGroupsForManifest = (manifest, datasets, allGroups) => {
     let result = [];
     const allDsGroups = manifest.datasource.map((dsId) => datasets.find((d) => d.id === dsId)?.groups ?? []);
-    if (allDsGroups.every((dsGroups) => dsGroups.includes(AUTHENTICATED_USERS_GROUP))) {
-        result = [...new Set(allDsGroups.flat())];
+    if (allDsGroups.every((dsGroups) => dsGroups.includes(PUBLIC_GROUP))) {
+        result = allGroups.map((group) => group.name);
+    }
+    else if (allDsGroups.every((dsGroups) => dsGroups.includes(PUBLIC_GROUP) || dsGroups.includes(AUTHENTICATED_USERS_GROUP))) {
+        result = allGroups.filter((group) => group.name !== PUBLIC_GROUP).map((group) => group.name);
     }
     else {
         const allDsGroupsFiltered = allDsGroups.filter((dsGroups) => !dsGroups.includes(AUTHENTICATED_USERS_GROUP) && !dsGroups.includes(PUBLIC_GROUP));
@@ -7694,7 +7697,6 @@ class PryAccessRightsShareComponent extends SubscriptionnerDirective {
         this.getGroupLabelByName = getGroupLabelByName;
         this.PUBLIC_GROUP = PUBLIC_GROUP;
         this.AUTHENTICATED_USERS_GROUP = AUTHENTICATED_USERS_GROUP;
-        this.store.dispatch(ConfigActions.loadAccessGroups());
         this.groups$ = combineLatest([
             this.store.select(ConfigSelectors.accessGroups),
             this._allowedGroups$,
@@ -7814,14 +7816,16 @@ class PryAccessRightsShareModalComponent {
         this.accessRightsByGroup = {};
         this.disableShareButton$ = new BehaviorSubject(false);
         this.store.dispatch(DataSourceActions.dataset.loadDataset());
+        this.store.dispatch(ConfigActions.loadAccessGroups());
         this.manifest = this.data.manifest;
         this.accessRightsByGroup = { ...this.manifest.accessRightsByGroup };
         this.allowedShareGroups$ = combineLatest([
             this.store.select(DataSourceSelectors.datasets),
-            this.store.select(DashboardSelectors.currentManifest)
-        ]).pipe(map(([datasets, current]) => {
+            this.store.select(DashboardSelectors.currentManifest),
+            this.store.select(ConfigSelectors.accessGroups)
+        ]).pipe(map(([datasets, current, groups]) => {
             return current && current.datasource.length > 0
-                ? getCommonDatasourceGroupsForManifest(current, datasets)
+                ? getCommonDatasourceGroupsForManifest(current, datasets, groups)
                 : null;
         }));
     }
@@ -7841,11 +7845,9 @@ class PryAccessRightsShareModalComponent {
     }
     validate() {
         this.store.dispatch(DashboardActions.saveManifest({
-            id: this.manifest.id ?? '',
-            name: this.manifest.name ?? '',
-            description: this.manifest.description ?? '',
-            image: this.manifest.image ?? '',
-            accessRightsByGroup: this.accessRightsByGroup
+            ...this.manifest,
+            accessRightsByGroup: this.accessRightsByGroup,
+            metadata: undefined
         }));
         this.toggleModal();
     }