@dhis2/analytics 27.0.0 → 28.0.0

package/build/es/components/FileMenu/__tests__/utils.spec.js

@@ -87,92 +87,37 @@ describe('utils', () => {
     });
   });
   describe('preparePayloadForSave', () => {
-    const mockEngine = {
-      query: jest.fn()
-    };
-    beforeEach(() => {
-      jest.clearAllMocks();
-    });
-    it('fetches subscribers and adds them to the visualization', async () => {
-      const visualization = {
-        id: '123',
-        type: 'BAR',
-        name: 'Existing Name',
-        description: 'Existing Description'
-      };
-      mockEngine.query.mockResolvedValue({
-        ao: {
-          subscribers: ['user1', 'user2']
-        }
-      });
-      const result = await preparePayloadForSave({
-        visualization,
-        engine: mockEngine
-      });
-      expect(mockEngine.query).toHaveBeenCalledWith({
-        ao: {
-          resource: 'visualizations',
-          id: expect.any(Function),
-          params: {
-            fields: 'subscribers'
-          }
-        }
-      }, {
-        variables: {
-          id: '123'
-        }
-      });
-      expect(result.subscribers).toEqual(['user1', 'user2']);
-    });
-    it('sets the name to the provided name', async () => {
+    it('sets the name to the provided name', () => {
       const visualization = {
         id: '123',
         type: 'MAP',
         name: 'Existing name'
       };
       const name = 'New Name';
-      mockEngine.query.mockResolvedValue({
-        ao: {
-          subscribers: []
-        }
-      });
-      const result = await preparePayloadForSave({
+      const result = preparePayloadForSave({
         visualization,
-        name,
-        engine: mockEngine
+        name
       });
       expect(result.name).toBe(name);
     });
-    it('sets the name to the existing name if no new name is provided', async () => {
+    it('sets the name to the existing name if no new name is provided', () => {
       const visualization = {
         id: '123',
         type: 'LINE_LIST',
         name: 'Existing Name'
       };
-      mockEngine.query.mockResolvedValue({
-        ao: {
-          subscribers: []
-        }
-      });
-      const result = await preparePayloadForSave({
-        visualization,
-        engine: mockEngine
+      const result = preparePayloadForSave({
+        visualization
       });
       expect(result.name).toBe('Existing Name');
     });
-    it('sets the name to a default value if no name is provided', async () => {
+    it('sets the name to a default value if no name is provided', () => {
       const visualization = {
         id: '123',
         type: 'BAR'
       };
-      mockEngine.query.mockResolvedValue({
-        ao: {
-          subscribers: []
-        }
-      });
-      const result = await preparePayloadForSave({
-        visualization,
-        engine: mockEngine
+      const result = preparePayloadForSave({
+        visualization
       });
       const expectedName = `Untitled Bar, ${new Date().toLocaleDateString(undefined, {
         year: 'numeric',
@@ -181,55 +126,37 @@ describe('utils', () => {
       })}`;
       expect(result.name).toBe(expectedName);
     });
-    it('sets the description to the provided description', async () => {
+    it('sets the description to the provided description', () => {
       const visualization = {
         id: '123',
         type: 'YEAR_OVER_YEAR_LINE',
         description: 'Existing Description'
       };
       const description = 'New Description';
-      mockEngine.query.mockResolvedValue({
-        ao: {
-          subscribers: []
-        }
-      });
-      const result = await preparePayloadForSave({
+      const result = preparePayloadForSave({
         visualization,
-        description,
-        engine: mockEngine
+        description
       });
       expect(result.description).toBe(description);
     });
-    it('keeps the existing description if no new description is provided', async () => {
+    it('keeps the existing description if no new description is provided', () => {
       const visualization = {
         id: '123',
         type: 'COLUMN',
         description: 'Existing Description'
       };
-      mockEngine.query.mockResolvedValue({
-        ao: {
-          subscribers: []
-        }
-      });
-      const result = await preparePayloadForSave({
-        visualization,
-        engine: mockEngine
+      const result = preparePayloadForSave({
+        visualization
       });
       expect(result.description).toBe('Existing Description');
     });
-    it('sets the description to undefined if no description is provided and none exists', async () => {
+    it('sets the description to undefined if no description is provided and none exists', () => {
       const visualization = {
         id: '123',
         type: 'BAR'
       };
-      mockEngine.query.mockResolvedValue({
-        ao: {
-          subscribers: []
-        }
-      });
-      const result = await preparePayloadForSave({
-        visualization,
-        engine: mockEngine
+      const result = preparePayloadForSave({
+        visualization
       });
       expect(result.description).toBeUndefined();
     });

package/build/es/components/FileMenu/utils.js

@@ -1,5 +1,5 @@
 import i18n from '@dhis2/d2-i18n';
-import { getDisplayNameByVisType, getApiEndpointByVisType } from '../../modules/visTypes.js';
+import { getDisplayNameByVisType } from '../../modules/visTypes.js';
 export const FILE_TYPE_EVENT_REPORT = 'eventReport';
 export const FILE_TYPE_VISUALIZATION = 'visualization';
 export const FILE_TYPE_MAP = 'map';
@@ -54,38 +54,12 @@ export const preparePayloadForSaveAs = _ref => {
   visualization.description = description !== undefined ? description : visualization.description;
   return visualization;
 };
-const getSubscriberQuery = type => ({
-  ao: {
-    resource: getApiEndpointByVisType(type),
-    id: _ref2 => {
-      let {
-        id
-      } = _ref2;
-      return id;
-    },
-    params: {
-      fields: 'subscribers'
-    }
-  }
-});
-const apiFetchAOSubscribers = (dataEngine, id, type) => {
-  return dataEngine.query(getSubscriberQuery(type), {
-    variables: {
-      id
-    }
-  });
-};
-export const preparePayloadForSave = async _ref3 => {
+export const preparePayloadForSave = _ref2 => {
   let {
     visualization,
     name,
-    description,
-    engine
-  } = _ref3;
-  const {
-    ao
-  } = await apiFetchAOSubscribers(engine, visualization.id, visualization.type);
-  visualization.subscribers = ao.subscribers;
+    description
+  } = _ref2;
   visualization.name = name || visualization.name || i18n.t('Untitled {{visualizationType}}, {{date}}', {
     visualizationType: getDisplayNameByVisType(visualization.type),
     date: new Date().toLocaleDateString(undefined, {
@@ -95,5 +69,7 @@ export const preparePayloadForSave = async _ref3 => {
     })
   });
   visualization.description = description !== undefined ? description : visualization.description;
+  delete visualization.displayName;
+  delete visualization.displayDescription;
   return visualization;
 };

package/build/es/modules/pivotTable/PivotTableEngine.js

@@ -243,10 +243,10 @@ export class PivotTableEngine {
         rawValue = parseValue(rawValue);
         switch (this.visualization.numberType) {
           case NUMBER_TYPE_ROW_PERCENTAGE:
-            renderedValue = rawValue / this.percentageTotals[row].value;
+            rawCell.pctValue = renderedValue = rawValue / this.percentageTotals[row].value;
             break;
           case NUMBER_TYPE_COLUMN_PERCENTAGE:
-            renderedValue = rawValue / this.percentageTotals[column].value;
+            rawCell.pctValue = renderedValue = rawValue / this.percentageTotals[column].value;
             break;
           default:
             break;
@@ -258,6 +258,19 @@ export class PivotTableEngine {
       rawCell.rawValue = rawValue;
       rawCell.renderedValue = renderedValue;
     }
+
+    // show the original value in the tooltip
+    if ([NUMBER_TYPE_COLUMN_PERCENTAGE, NUMBER_TYPE_ROW_PERCENTAGE].includes(this.visualization.numberType)) {
+      rawCell.titleValue = i18n.t('Value: {{value}}', {
+        value: renderValue(rawCell.rawValue, valueType,
+        // force VALUE for formatting the original value
+        {
+          ...this.visualization,
+          numberType: NUMBER_TYPE_VALUE
+        }),
+        nsSeparator: '^^'
+      });
+    }
     if ([CELL_TYPE_TOTAL, CELL_TYPE_SUBTOTAL].includes(rawCell.cellType) && rawCell.rawValue === AGGREGATE_TYPE_NA) {
       rawCell.titleValue = i18n.t('Not applicable');
     }
@@ -950,7 +963,11 @@ export class PivotTableEngine {
       if (!valueB || valueB.empty) {
         return 1 * order;
       }
-      if (valueA.valueType === VALUE_TYPE_NUMBER && valueB.valueType === VALUE_TYPE_NUMBER) {
+      if (
+      // for percentage strings, use the pctValue (percentage value) in the sort comparison
+      [NUMBER_TYPE_ROW_PERCENTAGE, NUMBER_TYPE_COLUMN_PERCENTAGE].includes(this.visualization.numberType)) {
+        return (valueA.pctValue - valueB.pctValue) * order;
+      } else if (valueA.valueType === VALUE_TYPE_NUMBER && valueB.valueType === VALUE_TYPE_NUMBER) {
         return (valueA.rawValue - valueB.rawValue) * order;
       }
       return valueA.renderedValue.localeCompare(valueB.renderedValue) * order;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/analytics",
-    "version": "27.0.0",
+    "version": "28.0.0",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "exports": {