Merge pull request #90 from EyeSeeTea/hotfix/atomic

hotfix: Disable atomic
EyeSeeTea · May 24, 2019 · d53b2a1 · d53b2a1
2 parents f846390 + 3bec150
commit d53b2a1
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "metadata-synchronization",
   "description": "Metadata Synchronization",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "license": "GPL-3.0",
   "author": "EyeSeeTea team",
   "homepage": ".",

diff --git a/src/components/sync-summary/SyncSummary.jsx b/src/components/sync-summary/SyncSummary.jsx
@@ -1,4 +1,5 @@
 import React from "react";
+import _ from "lodash";
 import i18n from "@dhis2/d2-i18n";
 import PropTypes from "prop-types";
 import { ConfirmationDialog } from "d2-ui-components";
@@ -157,7 +158,7 @@ class SyncSummary extends React.Component {
                                             className={classes.expansionPanelDetails}
                                         >
                                             {SyncSummary.buildMessageTable(
-                                                responseElement.report.messages
+                                                _.take(responseElement.report.messages, 10)
                                             )}
                                         </ExpansionPanelDetails>
                                     </div>

diff --git a/src/models/d2Model.ts b/src/models/d2Model.ts
@@ -101,7 +101,7 @@ export class OrganisationUnitModel extends D2Model {
         "organisationUnitGroups.organisationUnitGroupSets.userGroupAccesses",
     ];
     protected static includeRules = [
-        "attribute",
+        "attributes",
         "organisationUnitGroups",
         "organisationUnitGroups.attributes",
         "organisationUnitGroups.organisationUnitGroupSets",

diff --git a/src/utils/synchronization.ts b/src/utils/synchronization.ts
@@ -65,7 +65,7 @@ export async function postMetadata(instance: Instance, metadata: any): Promise<a
         importReportMode: "FULL",
         importStrategy: "CREATE_AND_UPDATE",
         mergeMode: "REPLACE",
-        atomicMode: "ALL",
+        atomicMode: "NONE",
     };
 
     try {