Merge pull request #4851 from kobotoolbox/dda-loading

Fix Dynamic Data Attachments question import not loading
kobotoolbox · Feb 20, 2024 · 0e76a65 · 0e76a65
2 parents a5a9958 + 7623e2d
commit 0e76a65
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/jsapp/js/assetQuickActions.tsx b/jsapp/js/assetQuickActions.tsx
@@ -405,17 +405,19 @@ export function removeAssetSharing(uid: string) {
    * "most basic" permission to remove.
    */
   const asset = stores.allAssets.byUid[uid];
-  const userViewAssetPerm = asset.permissions.find((perm: PermissionResponse) => {
-    // Get permissions url related to current user
-    const permUserUrl = perm.user.split('/');
-    return (
-      permUserUrl[permUserUrl.length - 2] ===
-        sessionStore.currentAccount.username &&
-      perm.permission ===
-        permConfig.getPermissionByCodename(PERMISSIONS_CODENAMES.view_asset)
-          ?.url
-    );
-  });
+  const userViewAssetPerm = asset.permissions.find(
+    (perm: PermissionResponse) => {
+      // Get permissions url related to current user
+      const permUserUrl = perm.user.split('/');
+      return (
+        permUserUrl[permUserUrl.length - 2] ===
+          sessionStore.currentAccount.username &&
+        perm.permission ===
+          permConfig.getPermissionByCodename(PERMISSIONS_CODENAMES.view_asset)
+            ?.url
+      );
+    }
+  );
 
   const dialog = alertify.dialog('confirm');
   const opts = {
@@ -489,10 +491,8 @@ function _redeployAsset(
       actions.resources.deployAsset(asset, true, {
         onDone: (response: DeploymentResponse) => {
           notify(t('redeployed form'));
-          // TODO: this ensures that after deploying an asset, we get the fresh
-          // data for it. But this also causes duplicated calls in some cases.
-          // It needs some investigation.
-          actions.resources.loadAsset({id: asset.uid});
+          // this ensures that after deploying an asset, we get the fresh data for it
+          actions.resources.loadAsset({id: asset.uid}, true);
           if (dialog && typeof dialog.destroy === 'function') {
             dialog.destroy();
           }

diff --git a/jsapp/js/components/dataAttachments/dataAttachmentColumnsForm.es6 b/jsapp/js/components/dataAttachments/dataAttachmentColumnsForm.es6
@@ -46,7 +46,7 @@ class DataAttachmentColumnsForm extends React.Component {
     // TODO: See if we can simplify this to only call this if props does not
     // have any connected questions
     // See: https://github.com/kobotoolbox/kpi/issues/3912
-    actions.resources.loadAsset({id: this.props.source.uid});
+    actions.resources.loadAsset({id: this.props.source.uid}, true);
 
     this.unlisteners.push(
       actions.dataShare.attachToSource.started.listen(

diff --git a/jsapp/js/components/modalForms/translationSettings.es6 b/jsapp/js/components/modalForms/translationSettings.es6
@@ -253,7 +253,7 @@ export class TranslationSettings extends React.Component {
       // reload asset on failure
       {
         onFailed: () => {
-          actions.resources.loadAsset({id: this.state.asset.uid});
+          actions.resources.loadAsset({id: this.state.asset.uid}, true);
           notify.error('failed to update translations');
         },
       }

diff --git a/jsapp/js/components/modalForms/translationTable.es6 b/jsapp/js/components/modalForms/translationTable.es6
@@ -253,7 +253,7 @@ export class TranslationTable extends React.Component {
       // reload asset on failure
       {
         onFailed: () => {
-          actions.resources.loadAsset({id: this.props.asset.uid});
+          actions.resources.loadAsset({id: this.props.asset.uid}, true);
           notify.error('failed to update translations');
         },
       }