@dhis2/analytics 23.7.3 → 23.7.4

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [23.7.4](https://github.com/dhis2/analytics/compare/v23.7.3...v23.7.4) (2022-04-06)
+
+
+### Bug Fixes
+
+* avoid dialog jumping when searching/paging TECH-1064 ([#1193](https://github.com/dhis2/analytics/issues/1193)) ([f06faa0](https://github.com/dhis2/analytics/commit/f06faa0d1fd8a7284d2a70cc6e17801ca303f300))
+
 ## [23.7.3](https://github.com/dhis2/analytics/compare/v23.7.2...v23.7.3) (2022-03-31)
 
 

package/build/cjs/components/OpenFileDialog/OpenFileDialog.js

@@ -198,7 +198,7 @@ const OpenFileDialog = ({
   const cypressSelector = 'open-file-dialog-modal';
   return /*#__PURE__*/_react.default.createElement(_ui.Modal, {
     large: true,
-    position: "middle",
+    position: "top",
     hide: !open,
     onClose: onClose,
     dataTest: cypressSelector
@@ -240,7 +240,9 @@ const OpenFileDialog = ({
   }, _d2I18n.default.t('Clear filters'))), error ? /*#__PURE__*/_react.default.createElement(_ui.NoticeBox, {
     title: (0, _utils.getTranslatedString)(type, 'errorTitle'),
     warning: true
-  }, (0, _utils.getTranslatedString)(type, 'errorText')) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_ui.DataTable, {
+  }, (0, _utils.getTranslatedString)(type, 'errorText')) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
+    className: "jsx-".concat(_OpenFileDialogStyles.styles.__hash) + " " + "data-table-wrapper"
+  }, /*#__PURE__*/_react.default.createElement(_ui.DataTable, {
     layout: "fixed"
   }, /*#__PURE__*/_react.default.createElement(_ui.DataTableHead, null, /*#__PURE__*/_react.default.createElement(_ui.DataTableRow, null, data !== null && data !== void 0 && data.files[_utils.AOTypeMap[type].apiEndpoint].length ? headers.map(({
     field,
@@ -263,7 +265,7 @@ const OpenFileDialog = ({
   }, loading && /*#__PURE__*/_react.default.createElement(_ui.DataTableRow, null, /*#__PURE__*/_react.default.createElement(_ui.DataTableCell, {
     large: true
   }, /*#__PURE__*/_react.default.createElement(_ui.Box, {
-    height: "384px"
+    height: "342px"
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "jsx-".concat(_OpenFileDialogStyles.styles.__hash) + " " + "info-cell"
   }, /*#__PURE__*/_react.default.createElement(_ui.CircularLoader, {
@@ -273,7 +275,7 @@ const OpenFileDialog = ({
   }, (0, _utils.getTranslatedString)(type, 'loadingText')))))), !loading && !(data !== null && data !== void 0 && data.files[_utils.AOTypeMap[type].apiEndpoint].length) > 0 && /*#__PURE__*/_react.default.createElement(_ui.DataTableRow, null, /*#__PURE__*/_react.default.createElement(_ui.DataTableCell, {
     large: true
   }, /*#__PURE__*/_react.default.createElement(_ui.Box, {
-    minHeight: "384px"
+    minHeight: "342px"
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "jsx-".concat(_OpenFileDialogStyles.styles.__hash) + " " + "info-cell"
   }, /*#__PURE__*/_react.default.createElement("div", {
@@ -293,15 +295,13 @@ const OpenFileDialog = ({
     data: data.files[_utils.AOTypeMap[type].apiEndpoint],
     onSelect: onFileSelect,
     showVisTypeColumn: Boolean(filterVisTypes === null || filterVisTypes === void 0 ? void 0 : filterVisTypes.length)
-  }))), (data === null || data === void 0 ? void 0 : data.files[_utils.AOTypeMap[type].apiEndpoint].length) > 0 && /*#__PURE__*/_react.default.createElement(_ui.DataTableToolbar, {
-    position: "bottom"
-  }, /*#__PURE__*/_react.default.createElement("div", {
+  })))), (data === null || data === void 0 ? void 0 : data.files[_utils.AOTypeMap[type].apiEndpoint].length) > 0 && /*#__PURE__*/_react.default.createElement("div", {
     className: "jsx-".concat(_OpenFileDialogStyles.styles.__hash) + " " + "pagination-controls"
   }, /*#__PURE__*/_react.default.createElement(_PaginationControls.PaginationControls, {
     page: page,
     pager: data.files.pager,
     onPageChange: setPage
-  })))), /*#__PURE__*/_react.default.createElement(_style.default, {
+  }))), /*#__PURE__*/_react.default.createElement(_style.default, {
     id: _OpenFileDialogStyles.styles.__hash
   }, _OpenFileDialogStyles.styles))));
 };

package/build/cjs/components/OpenFileDialog/OpenFileDialog.styles.js

@@ -7,6 +7,6 @@ exports.styles = void 0;
 
 var _ui = require("@dhis2/ui");
 
-const styles = [".data-table-body.jsx-1047699013{min-height:465px;}", ".pagination-controls.jsx-1047699013{width:100%;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-pack:end;-webkit-justify-content:flex-end;-ms-flex-pack:end;justify-content:flex-end;}", ".search-and-filter-bar.jsx-1047699013{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;gap:".concat(_ui.spacers.dp4, ";-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-bottom:").concat(_ui.spacers.dp8, ";}"), ".search-field-container.jsx-1047699013{min-width:220px;}", ".type-field-container.jsx-1047699013,.created-by-field-container.jsx-1047699013{min-width:180px;}", ".info-cell.jsx-1047699013{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;margin:".concat(_ui.spacers.dp32, " 0;}"), ".info-container.jsx-1047699013{max-width:400px;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;}", ".info-text.jsx-1047699013{text-align:center;font-size:14px;line-height:19px;color:".concat(_ui.colors.grey700, ";}"), ".info-button.jsx-1047699013{margin-top:".concat(_ui.spacers.dp12, ";}")];
+const styles = [".data-table-wrapper.jsx-3416632651{min-height:405px;}", ".data-table-body.jsx-3416632651{min-height:465px;}", ".pagination-controls.jsx-3416632651{width:100%;margin-top:".concat(_ui.spacers.dp12, ";display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-pack:end;-webkit-justify-content:flex-end;-ms-flex-pack:end;justify-content:flex-end;}"), ".search-and-filter-bar.jsx-3416632651{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;gap:".concat(_ui.spacers.dp4, ";-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-bottom:").concat(_ui.spacers.dp8, ";}"), ".search-field-container.jsx-3416632651{min-width:220px;}", ".type-field-container.jsx-3416632651,.created-by-field-container.jsx-3416632651{min-width:180px;}", ".info-cell.jsx-3416632651{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;gap:".concat(_ui.spacers.dp8, ";margin:").concat(_ui.spacers.dp32, " 0;}"), ".info-container.jsx-3416632651{max-width:400px;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;}", ".info-text.jsx-3416632651{text-align:center;font-size:14px;line-height:19px;color:".concat(_ui.colors.grey700, ";}"), ".info-button.jsx-3416632651{margin-top:".concat(_ui.spacers.dp12, ";}")];
 exports.styles = styles;
-styles.__hash = "1047699013";
+styles.__hash = "3416632651";

package/build/es/components/OpenFileDialog/OpenFileDialog.js

@@ -1,7 +1,7 @@
 import _JSXStyle from "styled-jsx/style";
 import { useDataQuery } from '@dhis2/app-runtime';
 import i18n from '@dhis2/d2-i18n';
-import { Box, Modal, ModalTitle, ModalContent, DataTable, DataTableHead, DataTableBody, DataTableRow, DataTableCell, DataTableColumnHeader, DataTableToolbar, NoticeBox, CircularLoader, Button } from '@dhis2/ui';
+import { Box, Modal, ModalTitle, ModalContent, DataTable, DataTableHead, DataTableBody, DataTableRow, DataTableCell, DataTableColumnHeader, NoticeBox, CircularLoader, Button } from '@dhis2/ui';
 import isEqual from 'lodash/isEqual';
 import PropTypes from 'prop-types';
 import React, { useEffect, useMemo, useState } from 'react';
@@ -171,7 +171,7 @@ export const OpenFileDialog = ({
   const cypressSelector = 'open-file-dialog-modal';
   return /*#__PURE__*/React.createElement(Modal, {
     large: true,
-    position: "middle",
+    position: "top",
     hide: !open,
     onClose: onClose,
     dataTest: cypressSelector
@@ -213,7 +213,9 @@ export const OpenFileDialog = ({
   }, i18n.t('Clear filters'))), error ? /*#__PURE__*/React.createElement(NoticeBox, {
     title: getTranslatedString(type, 'errorTitle'),
     warning: true
-  }, getTranslatedString(type, 'errorText')) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(DataTable, {
+  }, getTranslatedString(type, 'errorText')) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+    className: "jsx-".concat(styles.__hash) + " " + "data-table-wrapper"
+  }, /*#__PURE__*/React.createElement(DataTable, {
     layout: "fixed"
   }, /*#__PURE__*/React.createElement(DataTableHead, null, /*#__PURE__*/React.createElement(DataTableRow, null, data !== null && data !== void 0 && data.files[AOTypeMap[type].apiEndpoint].length ? headers.map(({
     field,
@@ -236,7 +238,7 @@ export const OpenFileDialog = ({
   }, loading && /*#__PURE__*/React.createElement(DataTableRow, null, /*#__PURE__*/React.createElement(DataTableCell, {
     large: true
   }, /*#__PURE__*/React.createElement(Box, {
-    height: "384px"
+    height: "342px"
   }, /*#__PURE__*/React.createElement("div", {
     className: "jsx-".concat(styles.__hash) + " " + "info-cell"
   }, /*#__PURE__*/React.createElement(CircularLoader, {
@@ -246,7 +248,7 @@ export const OpenFileDialog = ({
   }, getTranslatedString(type, 'loadingText')))))), !loading && !(data !== null && data !== void 0 && data.files[AOTypeMap[type].apiEndpoint].length) > 0 && /*#__PURE__*/React.createElement(DataTableRow, null, /*#__PURE__*/React.createElement(DataTableCell, {
     large: true
   }, /*#__PURE__*/React.createElement(Box, {
-    minHeight: "384px"
+    minHeight: "342px"
   }, /*#__PURE__*/React.createElement("div", {
     className: "jsx-".concat(styles.__hash) + " " + "info-cell"
   }, /*#__PURE__*/React.createElement("div", {
@@ -266,15 +268,13 @@ export const OpenFileDialog = ({
     data: data.files[AOTypeMap[type].apiEndpoint],
     onSelect: onFileSelect,
     showVisTypeColumn: Boolean(filterVisTypes === null || filterVisTypes === void 0 ? void 0 : filterVisTypes.length)
-  }))), (data === null || data === void 0 ? void 0 : data.files[AOTypeMap[type].apiEndpoint].length) > 0 && /*#__PURE__*/React.createElement(DataTableToolbar, {
-    position: "bottom"
-  }, /*#__PURE__*/React.createElement("div", {
+  })))), (data === null || data === void 0 ? void 0 : data.files[AOTypeMap[type].apiEndpoint].length) > 0 && /*#__PURE__*/React.createElement("div", {
     className: "jsx-".concat(styles.__hash) + " " + "pagination-controls"
   }, /*#__PURE__*/React.createElement(PaginationControls, {
     page: page,
     pager: data.files.pager,
     onPageChange: setPage
-  })))), /*#__PURE__*/React.createElement(_JSXStyle, {
+  }))), /*#__PURE__*/React.createElement(_JSXStyle, {
     id: styles.__hash
   }, styles))));
 };

package/build/es/components/OpenFileDialog/OpenFileDialog.styles.js

@@ -1,3 +1,3 @@
 import { colors, spacers } from '@dhis2/ui';
-export const styles = [".data-table-body.jsx-1047699013{min-height:465px;}", ".pagination-controls.jsx-1047699013{width:100%;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-pack:end;-webkit-justify-content:flex-end;-ms-flex-pack:end;justify-content:flex-end;}", ".search-and-filter-bar.jsx-1047699013{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;gap:".concat(spacers.dp4, ";-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-bottom:").concat(spacers.dp8, ";}"), ".search-field-container.jsx-1047699013{min-width:220px;}", ".type-field-container.jsx-1047699013,.created-by-field-container.jsx-1047699013{min-width:180px;}", ".info-cell.jsx-1047699013{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;margin:".concat(spacers.dp32, " 0;}"), ".info-container.jsx-1047699013{max-width:400px;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;}", ".info-text.jsx-1047699013{text-align:center;font-size:14px;line-height:19px;color:".concat(colors.grey700, ";}"), ".info-button.jsx-1047699013{margin-top:".concat(spacers.dp12, ";}")];
-styles.__hash = "1047699013";
+export const styles = [".data-table-wrapper.jsx-3416632651{min-height:405px;}", ".data-table-body.jsx-3416632651{min-height:465px;}", ".pagination-controls.jsx-3416632651{width:100%;margin-top:".concat(spacers.dp12, ";display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-pack:end;-webkit-justify-content:flex-end;-ms-flex-pack:end;justify-content:flex-end;}"), ".search-and-filter-bar.jsx-3416632651{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;gap:".concat(spacers.dp4, ";-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-bottom:").concat(spacers.dp8, ";}"), ".search-field-container.jsx-3416632651{min-width:220px;}", ".type-field-container.jsx-3416632651,.created-by-field-container.jsx-3416632651{min-width:180px;}", ".info-cell.jsx-3416632651{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;gap:".concat(spacers.dp8, ";margin:").concat(spacers.dp32, " 0;}"), ".info-container.jsx-3416632651{max-width:400px;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;}", ".info-text.jsx-3416632651{text-align:center;font-size:14px;line-height:19px;color:".concat(colors.grey700, ";}"), ".info-button.jsx-3416632651{margin-top:".concat(spacers.dp12, ";}")];
+styles.__hash = "3416632651";

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/analytics",
-    "version": "23.7.3",
+    "version": "23.7.4",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "exports": {
@@ -58,7 +58,7 @@
         "styled-jsx": "^3.3.2"
     },
     "dependencies": {
-        "@dhis2/d2-ui-translation-dialog": "^7.3.1",
+        "@dhis2/d2-ui-translation-dialog": "^7.3.3",
         "classnames": "^2.3.1",
         "d2-utilizr": "^0.2.16",
         "d3-color": "^1.2.3",