fix: migrate sharing object (#2830)

* fix(program): migrate program access step from legacy sharing * fix: more defensive in transform legeacy sharing * fix: sharing in list * fix: remove references to old sharing props * fix: undo webpack change * fix: add translation for icons * fix: sort sharing object, more defensive
dhis2 · Apr 25, 2024 · a806c8f · a806c8f
1 parent d0165cf
commit a806c8f
Show file tree

Hide file tree

Showing 12 changed files with 275 additions and 145 deletions.
diff --git a/src/App/appStateStore.js b/src/App/appStateStore.js
@@ -70,7 +70,7 @@ async function getCurrentUserOrganisationUnits(disableCache = false) {
 
     const d2 = await getInstance();
     const organisationUnitsCollection = await d2.currentUser.getOrganisationUnits({
-        fields: ':all,displayName,path,publicAccess,access,children[id,displayName,path,children::isNotEmpty,publicAccess,access]',
+        fields: ':all,displayName,path,access,children[id,displayName,path,children::isNotEmpty,sharing,access]',
         paging: false
     });
 
@@ -79,8 +79,8 @@ async function getCurrentUserOrganisationUnits(disableCache = false) {
             level: 1,
             paging: false,
             fields: [
-                'id,displayName,path,publicAccess,access,lastUpdated',
-                'children[id,displayName,publicAccess,access,path,children::isNotEmpty]',
+                'id,displayName,path,sharing,access,lastUpdated',
+                'children[id,displayName,sharing,access,path,children::isNotEmpty]',
             ].join(','),
         });
 

diff --git a/src/EditModel/event-program/epics.js b/src/EditModel/event-program/epics.js
@@ -148,9 +148,6 @@ function loadEventProgramMetadataByProgramId(programPayload) {
         'notificationTemplates[:owner]',
         'programTrackedEntityAttributes',
         'user[id,name]',
-        'publicAccess',
-        'userGroupAccesses',
-        'userAccesses',
         'categoryCombo[id,name]'
     ].join(',');
 
@@ -159,7 +156,7 @@ function loadEventProgramMetadataByProgramId(programPayload) {
     const queryParams = {
         fields: ':owner,displayName',
         'programs:filter': `id:eq:${programId}`,
-        'programs:fields': `${programFields},programStages[:owner, publicAccess, userGroupAccesses, userAccesses, user[id,name],displayName,attributeValues[:all,attribute[id,name,displayName]],programStageDataElements[:owner,renderType,dataElement[id,displayName,valueType,optionSet,domainType]],notificationTemplates[:owner,displayName],dataEntryForm[:owner],programStageSections[:owner,displayName,dataElements[id,displayName]]]`,
+        'programs:fields': `${programFields},programStages[:owner,user[id,name],displayName,attributeValues[:all,attribute[id,name,displayName]],programStageDataElements[:owner,renderType,dataElement[id,displayName,valueType,optionSet,domainType]],notificationTemplates[:owner,displayName],dataEntryForm[:owner],programStageSections[:owner,displayName,dataElements[id,displayName]]]`,
         'dataElements:fields': 'id,displayName,valueType,optionSet',
         'dataElements:filter': 'domainType:eq:TRACKER',
         'trackedEntityAttributes:fields': 'id,displayName,valueType,optionSet,unique'

diff --git a/src/EditModel/event-program/event-program-store/getMetaDataToSend.js b/src/EditModel/event-program/event-program-store/getMetaDataToSend.js
@@ -27,21 +27,11 @@ const hasDirtyProgramNotifications = state => programNotificationsSelector(state
 const hasDirtyDataEntryForms = compose(some(checkIfDirty), values, dataEntryFormsSelector);
 const hasDirtyProgramSections = compose(some(checkIfDirty), values, programSectionsSelector);
 
-/* Sharing settings was removed from :owner properties in 2.36
-    In programs we are using metadata API (instead of /sharing-api),
-    so we still need to include these properties
-*/
-const modelToJsonWithSharingProperties = model => {
-    const ownerProperties = model.modelDefinition.getOwnedPropertyNames()
-    const sharingProperties = ['publicAccess', 'userAccesses', 'userGroupAccesses']
-    return getJSONForProperties(model, ownerProperties.concat(sharingProperties))
-}
-
 const handleDataEntryForm = state => payload => {
     if (isProgramDirty(state)) {
         const withPrograms = {
             ...payload,
-            programs: [programSelector(state)].map(modelToJsonWithSharingProperties)
+            programs: [programSelector(state)].map(modelToJson)
         }
 
         //For custom-form
@@ -65,7 +55,7 @@ const handleProgramStages = state => payload => {
     if (isProgramStageDirty(state)) {
         return {
             ...payload,
-            programStages: programStagesSelector(state).map(modelToJsonWithSharingProperties)
+            programStages: programStagesSelector(state).map(modelToJson)
         }
     }
 

diff --git a/src/EditModel/event-program/program-access/ProgramAccess.js b/src/EditModel/event-program/program-access/ProgramAccess.js
@@ -15,12 +15,16 @@ const styles = {
     }
 };
 
-const ProgramNotSavedMessage = () => (
-    <div>Save the program in order to access sharing settings</div>
+const ProgramNotSavedMessage = (_, { d2 } ) => (
+    <div>{d2.i18n.getTranslation('save_the_program_in_order_to_access_sharing_settings')}</div>
 );
 
+ProgramNotSavedMessage.contextTypes = {
+    d2: PropTypes.object,
+}
+
 const ProgramStagesAccessHOC = branch(
-    props => !props.model.dataValues.publicAccess,
+    props => !props.model.dataValues.sharing,
     renderComponent(ProgramNotSavedMessage)
 )(ProgramStagesAccess);