feat: use the new SharingDialog with cascading sharing

dhis2 · Aug 24, 2021 · c02ed48 · c02ed48
1 parent 89dd128
commit c02ed48
Show file tree

Hide file tree

Showing 3 changed files with 452 additions and 367 deletions.
diff --git a/package.json b/package.json
@@ -5,6 +5,7 @@
     "private": true,
     "license": "BSD-3-Clause",
     "dependencies": {
+        "@dhis2-ui/sharing-dialog": "^6.19.0-alpha.1",
         "@dhis2/analytics": "^20.0.4",
         "@dhis2/app-runtime": "^2.8.0",
         "@dhis2/app-runtime-adapter-d2": "^1.1.0",
@@ -16,7 +17,7 @@
         "@dhis2/d2-ui-sharing-dialog": "^7.3.1",
         "@dhis2/d2-ui-translation-dialog": "^7.3.1",
         "@dhis2/data-visualizer-plugin": "^37.6.6",
-        "@dhis2/ui": "^6.13.0",
+        "@dhis2/ui": "6.19.0-alpha.1",
         "classnames": "^2.3.1",
         "d2": "^31.10.0",
         "d2-utilizr": "^0.2.16",

diff --git a/src/pages/view/TitleBar/TitleBar.js b/src/pages/view/TitleBar/TitleBar.js
@@ -1,7 +1,7 @@
+import { SharingDialog } from '@dhis2-ui/sharing-dialog'
 import { useDataEngine, useAlert } from '@dhis2/app-runtime'
 import { useD2 } from '@dhis2/app-runtime-adapter-d2'
 import i18n from '@dhis2/d2-i18n'
-import SharingDialog from '@dhis2/d2-ui-sharing-dialog'
 import {
     Button,
     FlyoutMenu,
@@ -224,14 +224,11 @@ const ViewTitleBar = ({
                     </div>
                 )}
             </div>
-            {id && (
+            {id && sharingDialogIsOpen && (
                 <SharingDialog
-                    d2={d2}
                     id={id}
                     type="dashboard"
-                    open={sharingDialogIsOpen}
-                    onRequestClose={toggleSharingDialog}
-                    insertTheme={true}
+                    onClose={toggleSharingDialog}
                 />
             )}
         </>