From 8d5309f8556a99dadc69a4df3b0902b894a34ec4 Mon Sep 17 00:00:00 2001 From: Martin Date: Tue, 14 May 2024 09:23:20 +0300 Subject: [PATCH 01/11] fix: system / user setting for display name not respected in Org Unit tree (DHIS2-15000) (#3051) --- package.json | 2 +- src/components/DimensionsPanel/Dialogs/DialogManager.js | 8 ++++++-- yarn.lock | 8 ++++---- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 9e31287a20..09d1e03f72 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "typescript": "^4.8.4" }, "dependencies": { - "@dhis2/analytics": "^26.6.8", + "@dhis2/analytics": "^26.6.9", "@dhis2/app-runtime": "^3.7.0", "@dhis2/app-runtime-adapter-d2": "^1.1.0", "@dhis2/app-service-datastore": "^1.0.0-beta.3", diff --git a/src/components/DimensionsPanel/Dialogs/DialogManager.js b/src/components/DimensionsPanel/Dialogs/DialogManager.js index e3844578d0..a7f59bbea4 100644 --- a/src/components/DimensionsPanel/Dialogs/DialogManager.js +++ b/src/components/DimensionsPanel/Dialogs/DialogManager.js @@ -234,7 +234,7 @@ export class DialogManager extends Component { // The OU content is persisted as mounted in order // to cache the org unit tree data - renderPersistedContent = (dimensionProps) => { + renderPersistedContent = (dimensionProps, displayNameProperty) => { const { ouIds, metadata, parentGraphMap, dialogId } = this.props if (this.state.ouMounted) { @@ -253,6 +253,7 @@ export class DialogManager extends Component { roots={this.props.rootOrgUnits.map( (rootOrgUnit) => rootOrgUnit.id )} + displayNameProp={displayNameProperty} {...dimensionProps} /> @@ -455,7 +456,10 @@ export class DialogManager extends Component { return ( - {this.renderPersistedContent(dimensionProps)} + {this.renderPersistedContent( + dimensionProps, + displayNameProperty + )} {dialogId && dynamicContent()} ) diff --git a/yarn.lock b/yarn.lock index 4b576076b7..6e2a7e522a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2028,10 +2028,10 @@ classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2/analytics@^26.6.8": - version "26.6.8" - resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-26.6.8.tgz#859f8086198664a9ea14cea149ce7bdf449a19a2" - integrity sha512-9l8001MAx+q8K1Qklui8pfF0rrv3MSLA1dEtM93rBODSsQwRE9pbt5wN44i9+n7nAgc7iItBehAQ1hMJ8j7yHg== +"@dhis2/analytics@^26.6.9": + version "26.6.9" + resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-26.6.9.tgz#932847c4bee3dd720d5d0b872c6b11eeae8b260c" + integrity sha512-AcU5FKH1Rmi8GdgqdJ1aOPqTKhztLafhzKNvGBdb5rSNR8/KS2djyTxxPhL0fdusu+1Rc04RFSkOLajq3ChVrQ== dependencies: "@dhis2/d2-ui-rich-text" "^7.4.1" "@dhis2/multi-calendar-dates" "1.0.0" From 76283082aa33d2976df28dfcc917431a750a0326 Mon Sep 17 00:00:00 2001 From: Martin Date: Tue, 14 May 2024 15:09:25 +0300 Subject: [PATCH 02/11] fix: dimension chip design updates (DHIS2-16272) (#2934) --- cypress/elements/layout.js | 21 +- cypress/integration/dimensions/data.cy.js | 16 +- cypress/integration/visTypes/scatter.cy.js | 76 +- i18n/en.pot | 13 +- package.json | 4 +- .../styles/DndDimensionList.module.css | 3 + .../IconButton/styles/IconButton.module.css | 10 +- src/components/Layout/Chip.js | 116 +-- .../styles/DefaultAxis.module.css | 2 +- src/components/Layout/styles/Chip.module.css | 119 +++ src/components/Layout/styles/Chip.style.js | 67 -- src/components/Layout/styles/style.js | 16 +- yarn.lock | 871 +++++++++--------- 13 files changed, 699 insertions(+), 635 deletions(-) create mode 100644 src/components/Layout/styles/Chip.module.css delete mode 100644 src/components/Layout/styles/Chip.style.js diff --git a/cypress/elements/layout.js b/cypress/elements/layout.js index 4fc765f5b5..aabf938e52 100644 --- a/cypress/elements/layout.js +++ b/cypress/elements/layout.js @@ -1,3 +1,5 @@ +import { EXTENDED_TIMEOUT } from '../support/utils.js' + const yoyCategorySelectEl = 'yoy-layout-rows-select' const youCategorySelectOptionEl = 'yoy-layout-rows-select-option' const chipEl = 'layout-chip' @@ -6,7 +8,7 @@ const chipMenuRemoveOptionEl = 'layout-chip-menu-dimension-menu-item-remove' const chipMenuActionOptionEl = 'layout-chip-menu-dimension-menu-item-action' const chipMenuSubMenuOptionEl = 'layout-chip-menu-dimension-menu-item-DIMENSIONID-menu' -const chipSelectedBackgroundColor = 'rgb(178, 223, 219)' +const chipSelectedBackgroundColor = 'rgb(224, 242, 241)' const getAxisEl = (axisId) => `${axisId}-axis` const getDimensionChipEl = (dimensionId) => `${chipEl}-${dimensionId}` @@ -54,13 +56,14 @@ export const expectDimensionToHaveItemAmount = ( itemAmount ? cy .getBySel(getDimensionChipEl(dimensionId)) - .contains(`${itemAmount} selected`) - .should('have.length', 1) - .and('be.visible') + .parent() + .findBySelLike('chip-suffix') + .contains(itemAmount, EXTENDED_TIMEOUT) : cy .getBySel(getDimensionChipEl(dimensionId)) - .contains(`selected`) - .should('have.length', 0) + .parent() + .findBySelLike('chip-suffix') + .should('not.exist') } else { throw new Error('dimensionId not provided') } @@ -69,9 +72,9 @@ export const expectDimensionToHaveItemAmount = ( export const expectDimensionToHaveAllItemsSelected = (dimensionId) => cy .getBySel(getDimensionChipEl(dimensionId)) - .contains(`: All`) - .should('have.length', 1) - .and('be.visible') + .parent() + .findBySelLike('chip-suffix') + .contains('all', EXTENDED_TIMEOUT) export const expectDimensionOnAxisToHaveLockIcon = (dimensionId, axisId) => cy diff --git a/cypress/integration/dimensions/data.cy.js b/cypress/integration/dimensions/data.cy.js index 8b8244eba8..9f70996f7c 100644 --- a/cypress/integration/dimensions/data.cy.js +++ b/cypress/integration/dimensions/data.cy.js @@ -301,10 +301,10 @@ describe('Data dimension', () => { if (testDataType.endpoint.hasMultiplePages) { // more items are fetched when scrolling down cy.intercept('GET', testDataType.endpoint.requestUrl).as( - 'request' + 'requestSecondPage' ) scrollSourceToBottom() - cy.wait('@request').then(({ request, response }) => { + cy.wait('@requestSecondPage').then(({ request, response }) => { expect(request.url).to.contain('page=2') expect(response.statusCode).to.eq(200) expect( @@ -384,13 +384,15 @@ describe('Data dimension', () => { `default sub group: ${testDataType.defaultSubGroup.name}` ) cy.intercept('GET', testDataType.endpoint.requestUrl).as( - 'request' + 'requestDefaultSubGroup' ) switchSubGroupTo(testDataType.defaultSubGroup.name) - cy.wait('@request').then(({ request, response }) => { - expect(request.url).to.contain('page=1') - expect(response.statusCode).to.eq(200) - }) + cy.wait('@requestDefaultSubGroup').then( + ({ request, response }) => { + expect(request.url).to.contain('page=1') + expect(response.statusCode).to.eq(200) + } + ) expectSourceToNotBeLoading() expectSubGroupSelectToBe(testDataType.defaultSubGroup.name) expectSelectableDataItemsAmountToBe( diff --git a/cypress/integration/visTypes/scatter.cy.js b/cypress/integration/visTypes/scatter.cy.js index d35eba4e66..98e00518bc 100644 --- a/cypress/integration/visTypes/scatter.cy.js +++ b/cypress/integration/visTypes/scatter.cy.js @@ -68,23 +68,26 @@ const TEST_INDICATOR_NAMES = TEST_INDICATORS.slice(1, 4).map( ) const TEST_VIS_NAME = `TEST SCATTER ${new Date().toLocaleString()}` -describe('using a Scatter chart', () => { - it('navigates to a new Scatter chart', () => { +describe('Scatter chart', () => { + it('works correctly (create, save, load, swap etc)', () => { + cy.log('navigates to a new Scatter chart') goToStartPage() changeVisType(visTypeDisplayNames[VIS_TYPE_SCATTER]) - }) - it("shows an error message when vertical and horizontal isn't selected", () => { + + cy.log( + "shows an error message when vertical and horizontal isn't selected" + ) clickMenuBarUpdateButton() expectErrorToContainTitle('Vertical is empty') - }) - it('adds a vertical item and shows an error message', () => { + + cy.log('adds a vertical item and shows an error message') openDimension(DIMENSION_ID_DATA) selectIndicators([TEST_INDICATOR_NAMES[0]]) clickDimensionModalUpdateButton() expectErrorToContainTitle('Horizontal is empty') expectVerticalToContainDimensionLabel(TEST_INDICATOR_NAMES[0]) - }) - it('adds a horizontal item and displays a chart', () => { + + cy.log('adds a horizontal item and displays a chart') openDimension(DIMENSION_ID_DATA) switchDataTab('Horizontal') selectIndicators([TEST_INDICATOR_NAMES[1]]) @@ -94,14 +97,14 @@ describe('using a Scatter chart', () => { //expectStoreCurrentColumnsToHaveLength(1) // FIXME: Store is always in default state expectVerticalToContainDimensionLabel(TEST_INDICATOR_NAMES[0]) expectHorizontalToContainDimensionLabel(TEST_INDICATOR_NAMES[1]) - }) - it('selects org unit level Facility', () => { + + cy.log('selects org unit level Facility') const TEST_ORG_UNIT_LEVEL = 'Facility' openDimension(DIMENSION_ID_ORGUNIT) expectOrgUnitDimensionModalToBeVisible() deselectUserOrgUnit('User organisation unit') expectOrgUnitDimensionToNotBeLoading() - // FIXME this selection causes a analytics request that takes too long on test instances + // FIXME: this selection causes a analytics request that takes too long on test instances //selectOrgUnitTreeItem('Sierra Leone') selectOrgUnitTreeItem('Bo') selectOrgUnitTreeItem('Bombali') @@ -109,25 +112,26 @@ describe('using a Scatter chart', () => { expectOrgUnitDimensionModalToBeVisible() clickDimensionModalUpdateButton() expectVisualizationToBeVisible(VIS_TYPE_SCATTER) - }) - it('Data is locked to Vertical', () => { + + cy.log('Data is locked to Vertical') expectDimensionOnAxisToHaveLockIcon(DIMENSION_ID_DATA, 'Vertical') - }) - it('Data is locked to Horizontal', () => { + + cy.log('Data is locked to Horizontal') expectDimensionOnAxisToHaveLockIcon(DIMENSION_ID_DATA, 'Horizontal') - }) - it('Org units is locked to Points', () => { + + cy.log('Org units is locked to Points') expectDimensionOnAxisToHaveLockIcon(DIMENSION_ID_ORGUNIT, AXIS_ID_ROWS) - }) - it('swaps vertical with horizontal', () => { + + cy.log('swaps vertical with horizontal') openContextMenu('VERTICAL') clickContextMenuSwap('VERTICAL', 'HORIZONTAL') clickMenuBarUpdateButton() expectVisualizationToBeVisible(VIS_TYPE_SCATTER) + expectAppToNotBeLoading() expectVerticalToContainDimensionLabel(TEST_INDICATOR_NAMES[1]) expectHorizontalToContainDimensionLabel(TEST_INDICATOR_NAMES[0]) - }) - it('adds a second item to horizontal and displays warning messages', () => { + + cy.log('adds a second item to horizontal and displays warning messages') openDimensionOnAxis(DIMENSION_ID_DATA, 'Horizontal') selectIndicators([TEST_INDICATOR_NAMES[2]]) expectDataDimensionModalWarningToContain( @@ -139,23 +143,27 @@ describe('using a Scatter chart', () => { ).id ) clickDimensionModalUpdateButton() + expectVisualizationToBeVisible(VIS_TYPE_SCATTER) + expectAppToNotBeLoading() expectDimensionOnAxisToHaveWarningIcon(DIMENSION_ID_DATA, 'Horizontal') - }) - it('saves and only displays 1 horizontal item', () => { + + cy.log('saves and only displays 1 horizontal item') saveNewAO(TEST_VIS_NAME) expectVisualizationToBeVisible(VIS_TYPE_SCATTER) + expectAppToNotBeLoading() expectVerticalToContainDimensionLabel(TEST_INDICATOR_NAMES[1]) expectHorizontalToContainDimensionLabel(TEST_INDICATOR_NAMES[0]) - }) - it('swaps vertical with horizontal', () => { + + cy.log('swaps vertical with horizontal') openContextMenu('HORIZONTAL') clickContextMenuSwap('HORIZONTAL', 'VERTICAL') clickMenuBarUpdateButton() expectVisualizationToBeVisible(VIS_TYPE_SCATTER) + expectAppToNotBeLoading() expectVerticalToContainDimensionLabel(TEST_INDICATOR_NAMES[0]) expectHorizontalToContainDimensionLabel(TEST_INDICATOR_NAMES[1]) - }) - it('Options -> Axes -> sets min/max range', () => { + + cy.log('Options -> Axes -> sets min/max range') const TEST_AXES = [ { axis: 'RANGE_0', label: 'Vertical (y) axis', min: 50, max: 150 }, { @@ -177,24 +185,24 @@ describe('using a Scatter chart', () => { expectWindowConfigYAxisToHaveRangeMaxValue(TEST_AXES[0].max) expectWindowConfigXAxisToHaveRangeMinValue(TEST_AXES[1].min) expectWindowConfigXAxisToHaveRangeMaxValue(TEST_AXES[1].max) - }) - it('Options -> Outliers -> enables outliers', () => { + + cy.log('Options -> Outliers -> enables outliers') openOptionsModal(OPTIONS_TAB_OUTLIERS) checkOutliersCheckbox() // TODO: Set more outlier options clickOptionsModalUpdateButton() expectVisualizationToBeVisible(VIS_TYPE_SCATTER) // TODO: Intercept the data returned to simplify / standardise it, then check that the $config has the correct data - }) - it('saves and displays items in the correct places', () => { + + cy.log('saves and displays items in the correct places') saveExistingAO() expectAppToNotBeLoading() expectVisualizationToBeVisible(VIS_TYPE_SCATTER) expectVerticalToContainDimensionLabel(TEST_INDICATOR_NAMES[0]) expectHorizontalToContainDimensionLabel(TEST_INDICATOR_NAMES[1]) - }) - // TODO: Open outlier options again and check that everything was saved correctly - it('deletes saved scatter AO', () => { + + // TODO: Open outlier options again and check that everything was saved correctly + cy.log('deletes saved scatter AO') deleteAO() expectStartScreenToBeVisible() expectRouteToBeEmpty() diff --git a/i18n/en.pot b/i18n/en.pot index 437ec605a4..5057c80c3f 100644 --- a/i18n/en.pot +++ b/i18n/en.pot @@ -160,14 +160,8 @@ msgstr "Download" msgid "Hide" msgstr "Hide" -msgid "All" -msgstr "All" - -msgid "{{total}} of {{axisMaxNumberOfItems}} selected" -msgstr "{{total}} of {{axisMaxNumberOfItems}} selected" - -msgid "{{total}} selected" -msgstr "{{total}} selected" +msgid "all" +msgstr "all" msgid "{{dimensionName}} is locked to {{axisName}} for {{visTypeName}}" msgstr "{{dimensionName}} is locked to {{axisName}} for {{visTypeName}}" @@ -469,6 +463,9 @@ msgstr "After last" msgid "Before first and after last" msgstr "Before first and after last" +msgid "All" +msgstr "All" + msgid "Hide empty rows" msgstr "Hide empty rows" diff --git a/package.json b/package.json index 09d1e03f72..925b97c42e 100644 --- a/package.json +++ b/package.json @@ -40,12 +40,12 @@ "typescript": "^4.8.4" }, "dependencies": { - "@dhis2/analytics": "^26.6.9", + "@dhis2/analytics": "^26.6.10", "@dhis2/app-runtime": "^3.7.0", "@dhis2/app-runtime-adapter-d2": "^1.1.0", "@dhis2/app-service-datastore": "^1.0.0-beta.3", "@dhis2/d2-i18n": "^1.1.0", - "@dhis2/ui": "^9.2.0", + "@dhis2/ui": "^9.4.4", "@krakenjs/post-robot": "^11.0.0", "d2": "^31.9.1", "decode-uri-component": "^0.2.2", diff --git a/src/components/DimensionsPanel/styles/DndDimensionList.module.css b/src/components/DimensionsPanel/styles/DndDimensionList.module.css index 5a107a22bd..37f4d0b203 100644 --- a/src/components/DimensionsPanel/styles/DndDimensionList.module.css +++ b/src/components/DimensionsPanel/styles/DndDimensionList.module.css @@ -19,6 +19,9 @@ .list { margin: 0; padding: 0; + display: flex; + flex-direction: column; + gap: 4px; } .header { diff --git a/src/components/IconButton/styles/IconButton.module.css b/src/components/IconButton/styles/IconButton.module.css index dcb3430030..413b863096 100644 --- a/src/components/IconButton/styles/IconButton.module.css +++ b/src/components/IconButton/styles/IconButton.module.css @@ -9,10 +9,10 @@ cursor: pointer; padding: 0; vertical-align: middle; - border-radius: 2px; - width: 22px; - height: 22px; - margin: '0px 0px 0px 2px'; + border-radius: 0; + width: 20px; + height: 20px; + margin: 0px 0px 0px 2px; color: var(--colors-grey700); } @@ -21,6 +21,6 @@ } .iconButton:hover { - background-color: rgba(0, 0, 0, 0.12); + background-color: rgba(0, 0, 0, 0.09); color: var(--colors-grey900); } diff --git a/src/components/Layout/Chip.js b/src/components/Layout/Chip.js index 411dca6523..2954de4473 100644 --- a/src/components/Layout/Chip.js +++ b/src/components/Layout/Chip.js @@ -18,7 +18,9 @@ import { ALL_DYNAMIC_DIMENSION_ITEMS, } from '@dhis2/analytics' import i18n from '@dhis2/d2-i18n' -import { Tooltip, IconLock16, IconWarningFilled16 } from '@dhis2/ui' +import { Tooltip, IconWarning16 } from '@dhis2/ui' +import { colors } from '@dhis2/ui-constants' +import cx from 'classnames' import PropTypes from 'prop-types' import React from 'react' import { connect } from 'react-redux' @@ -27,7 +29,7 @@ import { setDataTransfer } from '../../modules/dnd.js' import { sGetDimensions } from '../../reducers/dimensions.js' import { sGetMetadata } from '../../reducers/metadata.js' import { sGetUiType } from '../../reducers/ui.js' -import { styles } from './styles/Chip.style.js' +import styles from './styles/Chip.module.css' import { default as TooltipContent } from './TooltipContent.js' const Chip = ({ @@ -48,19 +50,31 @@ const Chip = ({ const LockIconWrapper = (
- + + +
) const WarningIconWrapper = (
- +
) @@ -90,6 +104,18 @@ const Chip = ({ const isSplitAxis = type === VIS_TYPE_SCATTER && dimensionId === DIMENSION_ID_DATA + let chipLabelSuffix + + if (items.length > 0) { + if (items.includes(ALL_DYNAMIC_DIMENSION_ITEMS)) { + chipLabelSuffix = i18n.t('all') + } else if (isSplitAxis) { + chipLabelSuffix = i18n.t(metadata[items[0]]?.name || null) + } else { + chipLabelSuffix = items.length + } + } + const handleClick = () => { if (!getPredefinedDimensionProp(dimensionId, DIMENSION_PROP_NO_ITEMS)) { onClick() @@ -100,48 +126,12 @@ const Chip = ({ setDataTransfer(event, axisId) } - const getWrapperStyles = () => ({ - ...styles.chipWrapper, - ...(!getPredefinedDimensionProp(dimensionId, DIMENSION_PROP_NO_ITEMS) && - !items.length - ? styles.chipEmpty - : {}), - }) - - const renderChipLabelSuffix = () => { - const numberOfItems = items.length - let itemsLabel - if (items.includes(ALL_DYNAMIC_DIMENSION_ITEMS)) { - itemsLabel = i18n.t('All') - } else if ( - !!getMaxNumberOfItems() && - numberOfItems > getMaxNumberOfItems() - ) { - itemsLabel = i18n.t( - `{{total}} of {{axisMaxNumberOfItems}} selected`, - { - total: numberOfItems, - axisMaxNumberOfItems: getMaxNumberOfItems(), - } - ) - } else { - if (isSplitAxis) { - itemsLabel = i18n.t(metadata[items[0]]?.name || '') - } else { - itemsLabel = i18n.t('{{total}} selected', { - total: numberOfItems, - }) - } - } - return items.length > 0 ? `: ${itemsLabel}` : '' - } - const renderChipIcon = () => { const Icon = getPredefinedDimensionProp(dimensionId, 'icon') return Icon ? ( - + ) : ( - + ) } @@ -174,21 +164,32 @@ const Chip = ({ const renderChipContent = () => ( <> -
{renderChipIcon()}
- +
{renderChipIcon()}
+ {dimensionName} - - {renderChipLabelSuffix()} - + {chipLabelSuffix && ( + + {chipLabelSuffix} + + )} {hasWarning && WarningIconWrapper} - {isLocked && LockIconWrapper} ) return (
{renderChipContent()}
)} - {contextMenu &&
{contextMenu}
} + {contextMenu && ( +
{contextMenu}
+ )} + {isLocked && ( + + {LockIconWrapper} + + )} ) } diff --git a/src/components/Layout/DefaultLayout/styles/DefaultAxis.module.css b/src/components/Layout/DefaultLayout/styles/DefaultAxis.module.css index 8b517bd680..2f3ba96073 100644 --- a/src/components/Layout/DefaultLayout/styles/DefaultAxis.module.css +++ b/src/components/Layout/DefaultLayout/styles/DefaultAxis.module.css @@ -4,7 +4,7 @@ align-items: flex-start; align-content: flex-start; flex-wrap: wrap; - min-height: 32px; + min-height: 26px; } .content > div { diff --git a/src/components/Layout/styles/Chip.module.css b/src/components/Layout/styles/Chip.module.css new file mode 100644 index 0000000000..822d94dc10 --- /dev/null +++ b/src/components/Layout/styles/Chip.module.css @@ -0,0 +1,119 @@ +.chip { + max-width: 400px; + display: flex; + align-items: center; + background-color: var(--colors-teal100); + padding: 0; + font-size: 13px; + line-height: 15px; + font-weight: 400; + color: var(--colors-teal900); + cursor: pointer; + user-select: none; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + margin: 2px; + border-radius: 2px; + border: 1px solid var(--colors-teal200); +} + +.chip:hover { + background: #cdeae8; + border: 1px solid #93c4bf; + box-shadow: 0 1px 2px 0 rgb(0 0 0 / 0.05); +} + +.chipEmpty { + background-color: var(--colors-grey100); + border-color: var(--colors-grey400); + color: var(--colors-grey900); +} + +.chipEmpty:hover { + background-color: var(--colors-grey200); + border-color: var(--colors-grey400); +} + +.fixedDimensionIcon { + padding: 0 4px; +} + +.leftIconWrapper { + padding: 0 4px; + display: flex; + align-items: center; +} + +.warningIconWrapper { + padding-left: 2px; + height: 20px; + display: flex; + align-items: center; +} + +.lockIconWrapper { + background: #cbe7e5; + height: 20px; + padding: 0 2px 0 3px; + margin: 0 0 0 2px; + display: flex; + align-items: center; + justify-content: center; +} + +.lockIconWrapper svg path { + fill: var(--colors-teal900); +} + +.chipEmpty .lockIconWrapper { + background: var(--colors-grey300); +} + +.chipEmpty .lockIconWrapper svg path { + fill: var(--colors-grey800); +} + +.label { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + +.chipLeft { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + display: flex; + border-top-right-radius: 0px; + border-bottom-right-radius: 0px; + align-items: center; + min-height: 20px; + margin: 0 2px 0 0; +} + +.chipRight { + padding-left: 0px; + border-top-left-radius: 0px; + border-bottom-left-radius: 0px; + display: flex; + height: 20px; +} + +.chipRight + .lockIconWrapper { + margin: 0; +} + +.suffix { + font-family: monospace; + font-size: 11px; + background: #c5e4e3; + border-radius: 2px; + margin-left: 4px; + min-width: 12px; + text-align: center; + padding: 2px 2px 1px 2px; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; +} diff --git a/src/components/Layout/styles/Chip.style.js b/src/components/Layout/styles/Chip.style.js deleted file mode 100644 index 39342a44ca..0000000000 --- a/src/components/Layout/styles/Chip.style.js +++ /dev/null @@ -1,67 +0,0 @@ -import { colors } from '@dhis2/ui' -import * as layoutStyle from './style.js' - -const baseChip = { - padding: layoutStyle.CHIP_PADDING, - fontSize: layoutStyle.CHIP_FONT_SIZE, - fontWeight: layoutStyle.CHIP_FONT_WEIGHT, - color: layoutStyle.CHIP_COLOR, - cursor: 'pointer', - minHeight: 24, - userSelect: 'none', -} - -export const styles = { - chipWrapper: { - display: 'flex', - margin: layoutStyle.CHIP_MARGIN, - backgroundColor: layoutStyle.CHIP_BACKGROUND_COLOR, - borderRadius: layoutStyle.CHIP_BORDER_RADIUS, - alignItems: 'center', - maxWidth: '400px', - }, - chip: { - ...baseChip, - whiteSpace: 'nowrap', - overflow: 'hidden', - textOverflow: 'ellipsis', - }, - chipEmpty: { - backgroundColor: colors.grey300, - }, - fixedDimensionIcon: { - paddingRight: '6px', - }, - leftIconWrapper: { - paddingRight: '6px', - display: 'flex', - alignItems: 'center', - }, - rightIconWrapper: { - paddingLeft: '6px', - marginTop: '2px', - }, - label: { - whiteSpace: 'nowrap', - overflow: 'hidden', - textOverflow: 'ellipsis', - }, -} - -styles.chipLeft = { - ...baseChip, - whiteSpace: 'nowrap', - overflow: 'hidden', - textOverflow: 'ellipsis', - display: 'flex', - borderTopRightRadius: '0px', - borderBottomRightRadius: '0px', - alignItems: 'center', -} - -styles.chipRight = { - ...baseChip, - paddingLeft: '0px', - borderTopLeftRadius: '0px', - borderBottomLeftRadius: '0px', -} diff --git a/src/components/Layout/styles/style.js b/src/components/Layout/styles/style.js index d91df2a50b..ff4a2f6257 100644 --- a/src/components/Layout/styles/style.js +++ b/src/components/Layout/styles/style.js @@ -1,22 +1,12 @@ -import { colors, theme } from '@dhis2/ui' +import { colors } from '@dhis2/ui' // Layout -export const LAYOUT_HEIGHT = '78px' +export const LAYOUT_HEIGHT = '70px' // Axis -export const AXIS_PADDING = '4px 4px 2px 6px' +export const AXIS_PADDING = '4px 4px 4px 6px' export const AXIS_LABEL_PADDING = '2px 0px 0px 4px' export const AXIS_BORDER_COLOR = colors.grey300 export const AXIS_BORDER_STYLE = 'solid' export const AXIS_BORDER_WIDTH = '0px 0px 1px 1px' export const AXIS_BACKGROUND_COLOR = colors.white - -// Chip -export const CHIP_COLOR = colors.grey900 -export const CHIP_FONT_WEIGHT = 400 -export const CHIP_FONT_SIZE = '14px' -export const CHIP_BACKGROUND_COLOR = theme.secondary200 -export const CHIP_HEIGHT = '14px' -export const CHIP_MARGIN = '4px' -export const CHIP_PADDING = '1px 2px 1px 6px' -export const CHIP_BORDER_RADIUS = '2px' diff --git a/yarn.lock b/yarn.lock index 6e2a7e522a..1988f07db2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1448,590 +1448,591 @@ debug "^3.1.0" lodash.once "^4.1.1" -"@dhis2-ui/alert@9.2.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@dhis2-ui/alert/-/alert-9.2.0.tgz#3b30e90a88a96c617219c60ad8bc16a5969e85d1" - integrity sha512-9uh6vIKlj9vm9wOr/7UvSvxrEgl0p99+FdfFtvCeiOywR2+CCPvd9fRsL/vWKcCraopOriCmTm5PzBUWPuatvg== +"@dhis2-ui/alert@9.4.4": + version "9.4.4" + resolved "https://registry.yarnpkg.com/@dhis2-ui/alert/-/alert-9.4.4.tgz#4045882cb5bc5e6763897e4eca3d779e54f64d71" + integrity sha512-v3TjIQEDqUtAqcUsH62/TYqQLehzqRPOwqdw6LDa3Yldqf9iMJ6v66DBESO2QsYd33ZWPj0+ZWw8BDtAP/SubQ== dependencies: - "@dhis2-ui/portal" "9.2.0" + "@dhis2-ui/portal" "9.4.4" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "9.2.0" - "@dhis2/ui-icons" "9.2.0" + "@dhis2/ui-constants" "9.4.4" + "@dhis2/ui-icons" "9.4.4" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/box@9.2.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@dhis2-ui/box/-/box-9.2.0.tgz#0f8fd79059d724c075180ea442c860ebff88c802" - integrity sha512-ERNEd8lDAQIGDmTYknWClPGbmWuOpFAnE8XurB6wrkydn0M2+wsIa00q2on6RgY2YaAjVtYZEXr9CfjBtwh04w== +"@dhis2-ui/box@9.4.4": + version "9.4.4" + resolved "https://registry.yarnpkg.com/@dhis2-ui/box/-/box-9.4.4.tgz#646cdb3b30708ba2332d249eae47fa03a1e6d309" + integrity sha512-xTkjLlcKm7Z6gESys2QLkgYWZSKyvKXcU4GHDJMZ+HXjiSxLfGSmbKDJfBkGuOsCGYlgCMdM1jMBUQjT7zp/Fg== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "9.2.0" + "@dhis2/ui-constants" "9.4.4" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/button@9.2.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@dhis2-ui/button/-/button-9.2.0.tgz#8d465f471ca629e1cb0ded01fc68143eb4960c1c" - integrity sha512-YBdIpaOqEgpI0JhHm8XBlpFGDF7O6eiFQ4Noxu131KEyDOf7a+AkIyECVZw6Jsj3n2zrbyzBDw6IndSFSlBqRQ== +"@dhis2-ui/button@9.4.4": + version "9.4.4" + resolved "https://registry.yarnpkg.com/@dhis2-ui/button/-/button-9.4.4.tgz#5fa1765e6b7a26fdeca875bf3114a5039deab8f0" + integrity sha512-U0JNzTcQkOlSm0GJsSPGRLDXMA5czS33SkaaL0S7kkNLcsTceZX/4cO6ldTuAJWPJLiuNsR8e/Rklos9xospLg== dependencies: - "@dhis2-ui/layer" "9.2.0" - "@dhis2-ui/loader" "9.2.0" - "@dhis2-ui/popper" "9.2.0" + "@dhis2-ui/layer" "9.4.4" + "@dhis2-ui/loader" "9.4.4" + "@dhis2-ui/popper" "9.4.4" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "9.2.0" - "@dhis2/ui-icons" "9.2.0" + "@dhis2/ui-constants" "9.4.4" + "@dhis2/ui-icons" "9.4.4" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/calendar@9.2.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@dhis2-ui/calendar/-/calendar-9.2.0.tgz#c3fbcdc622a13dd112de163719cfdcd0f960cfe2" - integrity sha512-6xxkCx66tjfGffGoPnDB6pe9Pvx+UybAGCqof7/0xfHP2vnfdss716imM02HfJRZwp5dNUrXqBO9uuQ1qkp/HA== - dependencies: - "@dhis2-ui/button" "9.2.0" - "@dhis2-ui/card" "9.2.0" - "@dhis2-ui/input" "9.2.0" - "@dhis2-ui/layer" "9.2.0" - "@dhis2-ui/popper" "9.2.0" - "@dhis2/multi-calendar-dates" "1.0.2" +"@dhis2-ui/calendar@9.4.4": + version "9.4.4" + resolved "https://registry.yarnpkg.com/@dhis2-ui/calendar/-/calendar-9.4.4.tgz#3b5147a42ffbefaab77824f5c95e755508d2291f" + integrity sha512-wBzWhJdnCyGJuNYFhLiLh2cwiSm2iSa/JNud449+atCK6O/XygBel96eaLUh63GWgKmM5RE9PIoHWm1xYfn5XA== + dependencies: + "@dhis2-ui/button" "9.4.4" + "@dhis2-ui/card" "9.4.4" + "@dhis2-ui/input" "9.4.4" + "@dhis2-ui/layer" "9.4.4" + "@dhis2-ui/popper" "9.4.4" + "@dhis2/multi-calendar-dates" "^1.1.1" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "9.2.0" - "@dhis2/ui-icons" "9.2.0" + "@dhis2/ui-constants" "9.4.4" + "@dhis2/ui-icons" "9.4.4" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/card@9.2.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@dhis2-ui/card/-/card-9.2.0.tgz#1a2d8f2f9becfd9fd43e7e315fda511418698fd1" - integrity sha512-++eLieBc4WsNXD1iQEQaqijnQ7hpKu0HH9cjkwTa46jjI9SoJGdYInvCzZPafB1XuCZ42f08kTcdND2qZWbssQ== +"@dhis2-ui/card@9.4.4": + version "9.4.4" + resolved "https://registry.yarnpkg.com/@dhis2-ui/card/-/card-9.4.4.tgz#8bb0ca90f5eef4421beef9506b2c244041f1c1ef" + integrity sha512-ZquXjtHeY+/zt5ojXmB8ZeqD5pnEriw7/8LHGi2TYGZovCbw0rN76pTIgL+9X7V2WcVbSQinxUpdlcXex8heGQ== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "9.2.0" + "@dhis2/ui-constants" "9.4.4" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/center@9.2.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@dhis2-ui/center/-/center-9.2.0.tgz#f7fbcbd00696d718286f269a64a5bad327160449" - integrity sha512-IBwLld/SQEtT5acjBr3nJnpkXNzypxm9f+QfdGYRq2ZSQmkIv9IUjIvlC25CU72Ksq+N0nWvA8AYp2Qx/l04fg== +"@dhis2-ui/center@9.4.4": + version "9.4.4" + resolved "https://registry.yarnpkg.com/@dhis2-ui/center/-/center-9.4.4.tgz#c62c32bbe83aa20278845ec22cfcb5cc3a394d26" + integrity sha512-I+d1ByUcemZDYCPauiXY/EOjUDjoLPXTzpzAF3AboZNvGjo2+1AgHKNkAMp5WgBBQRaGoAiNLRhhgGEX6f9DhQ== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "9.2.0" + "@dhis2/ui-constants" "9.4.4" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/checkbox@9.2.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@dhis2-ui/checkbox/-/checkbox-9.2.0.tgz#7f27c645bb9d31df4898c9c96cfdabf9ddd01ab3" - integrity sha512-EIGbkdnCLOyW3s7Mh31LdPgghHPaTAt0MJe5ieF/1NycUCfx99NGoR7wXlAlI6wNvjkuTYnYBknERGHUEzY9rA== +"@dhis2-ui/checkbox@9.4.4": + version "9.4.4" + resolved "https://registry.yarnpkg.com/@dhis2-ui/checkbox/-/checkbox-9.4.4.tgz#61b75fa7d1773e1d9a11b95126c44a465ac59eaa" + integrity sha512-i26bv/lBynQ1AeOhMmRJ4rQJr5HOFXe4VNCaQhq/+1q+g2dewyf0gIygJnjYMzcX48eyfQsBDU5JBYhuSz6kWw== dependencies: - "@dhis2-ui/field" "9.2.0" - "@dhis2-ui/required" "9.2.0" + "@dhis2-ui/field" "9.4.4" + "@dhis2-ui/required" "9.4.4" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "9.2.0" + "@dhis2/ui-constants" "9.4.4" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/chip@9.2.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@dhis2-ui/chip/-/chip-9.2.0.tgz#45b5e55e6d11318bb6917f1bcdee9bf9b67bd620" - integrity sha512-PesbKz0MrXegDAFcGHq34Ast0kM/mJrmExiLua262egYYaRiQXDYeaNuS2TT+qPsPsDva2Pp7kqjdrFRDL2Few== +"@dhis2-ui/chip@9.4.4": + version "9.4.4" + resolved "https://registry.yarnpkg.com/@dhis2-ui/chip/-/chip-9.4.4.tgz#f1b151e0bc091aca4e288ed7f4889a38bf1f74c6" + integrity sha512-+2FLdWcDGNOQmrCU0sKve+JRD1hwCd53sQ0D/OCI4zFCrJwJ5C7Pet5Y3Ys0hv8lAu4hCdwklSyKuwlIjYntjg== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "9.2.0" + "@dhis2/ui-constants" "9.4.4" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/cover@9.2.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@dhis2-ui/cover/-/cover-9.2.0.tgz#0288dad0ba9caf8c0b77c86868fc4bae3388f6c7" - integrity sha512-ZxcOOuyy/dB4pgjdVzBlgwtVue0HEct2XOiuIKM66F5G0DPBqz6UtLDD+8VRofQwTKcTYQh9kPZPmx/9q65Zcg== +"@dhis2-ui/cover@9.4.4": + version "9.4.4" + resolved "https://registry.yarnpkg.com/@dhis2-ui/cover/-/cover-9.4.4.tgz#89ed8113be5ba541d7250e32a828c5e2046369e7" + integrity sha512-JAywkI+Hebyn4EkiSf3li2E2+iDUvBwcgHH4AW5QkkRaM8YGqgluNnsn+AOL1Igs6lXh3jzGrsiN3xZSoGO6ww== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "9.2.0" + "@dhis2/ui-constants" "9.4.4" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/css@9.2.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@dhis2-ui/css/-/css-9.2.0.tgz#ad881b90371c7506690ee2a2b2151c09f793e368" - integrity sha512-dBe9S75+Nj1c9SNRkxU0VWTVwFZJ+vLFKxD1UYaPdbJ2DHD6AD4UJ1YtXgvBvgiJ0wbT1vesh3tKfEUXbnTmkw== +"@dhis2-ui/css@9.4.4": + version "9.4.4" + resolved "https://registry.yarnpkg.com/@dhis2-ui/css/-/css-9.4.4.tgz#c46af291af86eec008f60205c7c46e100ef8188a" + integrity sha512-VBmYcTKet0YDEguptZ0+Yc789HmNiaMDTu3iUnJKuvurhYSaFGD/oK7d2Sr6bIo0KTQ+/XpcOL68+wRLktGgwQ== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "9.2.0" + "@dhis2/ui-constants" "9.4.4" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/divider@9.2.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@dhis2-ui/divider/-/divider-9.2.0.tgz#2f9ea2f3a1f89853963bcffdeef27e5ebc390021" - integrity sha512-z87v4XKIO1IXhWmHYhCQgR7MTiuU+zLMg9Py2OIDxMchVXrdyGSeKCpL9UgOzl/jtHxwoMdnVDzy8sLLzITgsw== +"@dhis2-ui/divider@9.4.4": + version "9.4.4" + resolved "https://registry.yarnpkg.com/@dhis2-ui/divider/-/divider-9.4.4.tgz#d904282c0bc8552180923e36189b421dfb4d3853" + integrity sha512-YjERDzyV4aznyKpREUDhh5QgykRAhNE6xr7rO5LiCNeFx2MpZY1Xq6AFoPZSuy966iAEU0KmOK+8Ow0NGg/9GA== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "9.2.0" + "@dhis2/ui-constants" "9.4.4" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/field@9.2.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@dhis2-ui/field/-/field-9.2.0.tgz#d16b443ff168e352b6f5168d2179975377902dd1" - integrity sha512-pZr1LkzOm4TOPdPAen9e3RHQE8Y1uCbdFhP1oc5vg44etmudX7stJuEXP6/DrPm6sHCJRojf90laqPai1vfrHg== +"@dhis2-ui/field@9.4.4": + version "9.4.4" + resolved "https://registry.yarnpkg.com/@dhis2-ui/field/-/field-9.4.4.tgz#80753ca3bc2c419dc1066e5e6d662b18ddaec032" + integrity sha512-07O3Npth26D0+kOHYdsfoF3fZm8SXfmtonKyOIOpRAmIX1TJZRNO9LuI5S9+z5vh0++x3Y+c9hIFmac0Vvm9aQ== dependencies: - "@dhis2-ui/box" "9.2.0" - "@dhis2-ui/help" "9.2.0" - "@dhis2-ui/label" "9.2.0" + "@dhis2-ui/box" "9.4.4" + "@dhis2-ui/help" "9.4.4" + "@dhis2-ui/label" "9.4.4" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "9.2.0" + "@dhis2/ui-constants" "9.4.4" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/file-input@9.2.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@dhis2-ui/file-input/-/file-input-9.2.0.tgz#d48e9d290aea798640b251d915b9a8f51abcf363" - integrity sha512-x+lKilo6aQN320fIAPZMAq13PxKuTb/jhZb7m7pMS0HKsPqfT5rWm1VfmBlN/02BkKsmhsvo/tTe9vxpAic71A== +"@dhis2-ui/file-input@9.4.4": + version "9.4.4" + resolved "https://registry.yarnpkg.com/@dhis2-ui/file-input/-/file-input-9.4.4.tgz#02878069f9f4db33a14dba9e18642d8e85f6d2e9" + integrity sha512-GS89r/FxYfd9GlXUqscUXjzh1f190mo9qwJN6GrrzeK+gSGwtFDtGHDCyES7qQ8MdtvgDlC8Dgdjl5EU7YP6tQ== dependencies: - "@dhis2-ui/button" "9.2.0" - "@dhis2-ui/field" "9.2.0" - "@dhis2-ui/label" "9.2.0" - "@dhis2-ui/loader" "9.2.0" - "@dhis2-ui/status-icon" "9.2.0" + "@dhis2-ui/button" "9.4.4" + "@dhis2-ui/field" "9.4.4" + "@dhis2-ui/label" "9.4.4" + "@dhis2-ui/loader" "9.4.4" + "@dhis2-ui/status-icon" "9.4.4" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "9.2.0" - "@dhis2/ui-icons" "9.2.0" + "@dhis2/ui-constants" "9.4.4" + "@dhis2/ui-icons" "9.4.4" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/header-bar@9.2.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@dhis2-ui/header-bar/-/header-bar-9.2.0.tgz#83efe93821318decca3bd1a28d30fd3089435b6d" - integrity sha512-7iNKOllQNeYfa9nJjXVqiohcuKEk+RMhuu/7BY8g2oPmwbvS0uc49KiL53cFfAWBST/v5fU1XOpWS/N7PmJr2g== - dependencies: - "@dhis2-ui/box" "9.2.0" - "@dhis2-ui/button" "9.2.0" - "@dhis2-ui/card" "9.2.0" - "@dhis2-ui/center" "9.2.0" - "@dhis2-ui/divider" "9.2.0" - "@dhis2-ui/input" "9.2.0" - "@dhis2-ui/layer" "9.2.0" - "@dhis2-ui/loader" "9.2.0" - "@dhis2-ui/logo" "9.2.0" - "@dhis2-ui/menu" "9.2.0" - "@dhis2-ui/modal" "9.2.0" - "@dhis2-ui/user-avatar" "9.2.0" +"@dhis2-ui/header-bar@9.4.4": + version "9.4.4" + resolved "https://registry.yarnpkg.com/@dhis2-ui/header-bar/-/header-bar-9.4.4.tgz#7c26955ea968bb25cac6766e549402ccde34d8c3" + integrity sha512-IA6yFbFFimWMYyHSD9idCLCamnWtAgRuoD3FG/8kKvOurTEwUcb0qYaecnQAstwWwZ8C+ZIKiTB0796WXj/SDg== + dependencies: + "@dhis2-ui/box" "9.4.4" + "@dhis2-ui/button" "9.4.4" + "@dhis2-ui/card" "9.4.4" + "@dhis2-ui/center" "9.4.4" + "@dhis2-ui/divider" "9.4.4" + "@dhis2-ui/input" "9.4.4" + "@dhis2-ui/layer" "9.4.4" + "@dhis2-ui/loader" "9.4.4" + "@dhis2-ui/logo" "9.4.4" + "@dhis2-ui/menu" "9.4.4" + "@dhis2-ui/modal" "9.4.4" + "@dhis2-ui/user-avatar" "9.4.4" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "9.2.0" - "@dhis2/ui-icons" "9.2.0" + "@dhis2/ui-constants" "9.4.4" + "@dhis2/ui-icons" "9.4.4" classnames "^2.3.1" moment "^2.29.1" prop-types "^15.7.2" -"@dhis2-ui/help@9.2.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@dhis2-ui/help/-/help-9.2.0.tgz#76556c0d581fb0f7611fe5c5bb0d9adf35ad0c8e" - integrity sha512-qD3oNEwEb+pT7jsD4ciHtu16KrxMySPWoqco5nJwoGbcZFLw/caEfkBo2IroImD0MxtI0mKt5emD7V2yXRWm7A== +"@dhis2-ui/help@9.4.4": + version "9.4.4" + resolved "https://registry.yarnpkg.com/@dhis2-ui/help/-/help-9.4.4.tgz#6b3df94b6b8c0f7269dde3c90602dbb6dac889fa" + integrity sha512-V/ZNC/QwlN+444rb2wBAzEkqeLToafHQOEWCUUvcYEgC2Vxdh2bXEqBl6w4Bv2Xmh563k+AdxvXZtVL4zLA/og== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "9.2.0" + "@dhis2/ui-constants" "9.4.4" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/input@9.2.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@dhis2-ui/input/-/input-9.2.0.tgz#bdf7c72e11b818ed86e1e6335cd373ae037f4ef3" - integrity sha512-0bzF/8pZSMqe5ZN2v0t0/rMTvKWd9kl5MDOy9fRXpX6yoFgfH+j+iIU06eVyqJl3DMqCdInfapJvpJR7MHvd+g== +"@dhis2-ui/input@9.4.4": + version "9.4.4" + resolved "https://registry.yarnpkg.com/@dhis2-ui/input/-/input-9.4.4.tgz#621eab6b8d535fcb111094f660415ff4136cb156" + integrity sha512-F6GEeRUQXFxjhoY3+CuaZWrkS2D54vTuP429uCL77/Wn2HdqYWnDMz3ILubIR+T1C5otmAH5cqW3IinRGlOq+Q== dependencies: - "@dhis2-ui/box" "9.2.0" - "@dhis2-ui/field" "9.2.0" - "@dhis2-ui/input" "9.2.0" - "@dhis2-ui/loader" "9.2.0" - "@dhis2-ui/status-icon" "9.2.0" + "@dhis2-ui/box" "9.4.4" + "@dhis2-ui/field" "9.4.4" + "@dhis2-ui/input" "9.4.4" + "@dhis2-ui/loader" "9.4.4" + "@dhis2-ui/status-icon" "9.4.4" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "9.2.0" - "@dhis2/ui-icons" "9.2.0" + "@dhis2/ui-constants" "9.4.4" + "@dhis2/ui-icons" "9.4.4" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/intersection-detector@9.2.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@dhis2-ui/intersection-detector/-/intersection-detector-9.2.0.tgz#31f19bfb8645ebda7d7af6f6e641b40fa1e57888" - integrity sha512-erBoDMhOPmua8eP8bKJNl4WIUUm+Fw3Jj9M0OxC+xia3/Fi8scLUyk0Yek1Y0lGdb4YHJEXqx475dLNjpmiLRQ== +"@dhis2-ui/intersection-detector@9.4.4": + version "9.4.4" + resolved "https://registry.yarnpkg.com/@dhis2-ui/intersection-detector/-/intersection-detector-9.4.4.tgz#1ad2a7b47a84aeb674274272d362302f4b23ba56" + integrity sha512-+DhDX7/Y0uKZnTy4r4qTt6kQtdlYxJVnlx42CwAO4KWAJirOISDyepzKUii9ZFMLCcxQgQ2uddiCwdjPqLqiAQ== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "9.2.0" + "@dhis2/ui-constants" "9.4.4" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/label@9.2.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@dhis2-ui/label/-/label-9.2.0.tgz#81ec2de2ea1b9bc7cf25eb8bb036d451d5b61748" - integrity sha512-k9Q4XyIbaNRvCn1+rLcEb/iDi479S3fOEJ2MCT6wsGxr1+Hys7yVw7Ggq0OQ9SLCEwElNQcvj+vWB4dZltXl5Q== +"@dhis2-ui/label@9.4.4": + version "9.4.4" + resolved "https://registry.yarnpkg.com/@dhis2-ui/label/-/label-9.4.4.tgz#107e21bcc7a8d29e8355d54d5e475c96364fc78d" + integrity sha512-uoYpozTDR1kxM+g8tWvvCV9Z4KT9+t4t4IKULICJLwEW8JfwXQxZnVmCvCc3Zv2fHZlmUN9XXGVt00VG1ldWsg== dependencies: - "@dhis2-ui/required" "9.2.0" + "@dhis2-ui/required" "9.4.4" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "9.2.0" + "@dhis2/ui-constants" "9.4.4" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/layer@9.2.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@dhis2-ui/layer/-/layer-9.2.0.tgz#7afcb2ef8571eb9c839fc522eb76ead70e395dbc" - integrity sha512-95aFgQYxgJ7GmWY6AOSoAH4BH7wkIyUAioAIRUDwp0mmSJhJxG6P9b1PFqw4koX1zV4/RLoz+NiQ7Twv+03CLQ== +"@dhis2-ui/layer@9.4.4": + version "9.4.4" + resolved "https://registry.yarnpkg.com/@dhis2-ui/layer/-/layer-9.4.4.tgz#980a9e397468b9418937202a0afaae868bed4b4b" + integrity sha512-PLqcBHfUB1EV24trWbkDv2m1viU3ijVYZQa13htxa5r800ei+ze6K4x15hnvI9qtCbNAvBv/N1Axxui4Xwjkdg== dependencies: - "@dhis2-ui/portal" "9.2.0" + "@dhis2-ui/portal" "9.4.4" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "9.2.0" + "@dhis2/ui-constants" "9.4.4" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/legend@9.2.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@dhis2-ui/legend/-/legend-9.2.0.tgz#a051822fd67c1442b6986a86097aca94f3960dd2" - integrity sha512-IfJhu48eu//O9AlHt7IUdsv5E92XG7v/95laFfyQOaGhf1C4BQf11s6yXc3nTFoil/p55oAsZnWp5e7UXcgrhg== +"@dhis2-ui/legend@9.4.4": + version "9.4.4" + resolved "https://registry.yarnpkg.com/@dhis2-ui/legend/-/legend-9.4.4.tgz#5476cfa7937ca9bbac3b9e64e991b17d51e9ced1" + integrity sha512-uqxHCFYMfP8yxV0lOyOgKbOUYRP3TNoO+fHyo78y2OGhjrsanHolZMPokf+POgZAFmBvQDtibOoyp2J7jq1Qog== dependencies: - "@dhis2-ui/required" "9.2.0" + "@dhis2-ui/required" "9.4.4" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "9.2.0" + "@dhis2/ui-constants" "9.4.4" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/loader@9.2.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@dhis2-ui/loader/-/loader-9.2.0.tgz#f45fdb19a37182351932cd3e11980d43b4895d40" - integrity sha512-M8tuLE5kgm7oHmIN6par8GfRDpmt+DXFU3cCSZdiYIUM6SQSD8G5LmA8AaIHR5h7l430d93vcw7RQL3eeE/svw== +"@dhis2-ui/loader@9.4.4": + version "9.4.4" + resolved "https://registry.yarnpkg.com/@dhis2-ui/loader/-/loader-9.4.4.tgz#2bd268cba9310db47c0a9dda04cff760380fc6b0" + integrity sha512-2B9PZ/iQIuCWbPIQFihrmX+1YHW5vZlOv+rsJT1SipSIj5sLWy4KYtjvm89lSu+Or60jnrNAJ8Iix5bnlb+dWw== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "9.2.0" + "@dhis2/ui-constants" "9.4.4" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/logo@9.2.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@dhis2-ui/logo/-/logo-9.2.0.tgz#0452aadd8e92afc1c558869a08c8e5d1f14ff55f" - integrity sha512-OEFrSpDijeCIhLjJ8vipDGRdihTgj8+iLcPLDrOeRAurlgJZJZiicxBKSuY6uc6p1/9QPccqX2huJjM1uNqo2g== +"@dhis2-ui/logo@9.4.4": + version "9.4.4" + resolved "https://registry.yarnpkg.com/@dhis2-ui/logo/-/logo-9.4.4.tgz#a0050a56aabafe33ef4c232a116980d289fbcc34" + integrity sha512-Nps/U5rCBaO8X8/A0gbd8SuGRdd1ymCRnXv5FuUvciQ8CcoQnjE8aVi0TMY1h/A8XDrLWZXyAnm3WbmA0GnOvw== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "9.2.0" + "@dhis2/ui-constants" "9.4.4" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/menu@9.2.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@dhis2-ui/menu/-/menu-9.2.0.tgz#996729545b29def9366a099005a17c781bdca8f6" - integrity sha512-8k15qmoqBWKo1Afj+QXFnDAIoDyAqosvq3j8M/+xM+cSn0H+6e3Q7UOp0ByVQlumoY5DyrT9Z7NojULIjFUifQ== +"@dhis2-ui/menu@9.4.4": + version "9.4.4" + resolved "https://registry.yarnpkg.com/@dhis2-ui/menu/-/menu-9.4.4.tgz#a25fe07705d8e14e97390d8b59e7330d7fdc335e" + integrity sha512-TSIPM9vNswIo59yxPEZN30KTWbxQNXC2BLu6Fkd0FpgLO8ZxnAtG7qbgay8Y3c+9FIAt+Be/N41d+5VlSG8WtA== dependencies: - "@dhis2-ui/card" "9.2.0" - "@dhis2-ui/divider" "9.2.0" - "@dhis2-ui/layer" "9.2.0" - "@dhis2-ui/popper" "9.2.0" - "@dhis2-ui/portal" "9.2.0" + "@dhis2-ui/card" "9.4.4" + "@dhis2-ui/divider" "9.4.4" + "@dhis2-ui/layer" "9.4.4" + "@dhis2-ui/popper" "9.4.4" + "@dhis2-ui/portal" "9.4.4" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "9.2.0" - "@dhis2/ui-icons" "9.2.0" + "@dhis2/ui-constants" "9.4.4" + "@dhis2/ui-icons" "9.4.4" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/modal@9.2.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@dhis2-ui/modal/-/modal-9.2.0.tgz#7815efe62be4f482b2e2224ffe92981068b1bae9" - integrity sha512-gp+gCTmtoiLVAhigo1i6msE598qIGnkW6To+dTkUecvxyvni+DZTAulTmL62UtTzzjPjYO0yOqNTWQztbpj1KQ== +"@dhis2-ui/modal@9.4.4": + version "9.4.4" + resolved "https://registry.yarnpkg.com/@dhis2-ui/modal/-/modal-9.4.4.tgz#3edbc8e3bb942aba2c8377aadd79514fe2fa7930" + integrity sha512-Ny9y9hxinbrnSQxoDCFh902BNozGjHdp1YG5w+sxyg4gfUjP2gh+OyoLILvw8LqvrjoukI7anfmikNoAEwjanw== dependencies: - "@dhis2-ui/card" "9.2.0" - "@dhis2-ui/center" "9.2.0" - "@dhis2-ui/layer" "9.2.0" - "@dhis2-ui/portal" "9.2.0" + "@dhis2-ui/card" "9.4.4" + "@dhis2-ui/center" "9.4.4" + "@dhis2-ui/layer" "9.4.4" + "@dhis2-ui/portal" "9.4.4" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "9.2.0" - "@dhis2/ui-icons" "9.2.0" + "@dhis2/ui-constants" "9.4.4" + "@dhis2/ui-icons" "9.4.4" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/node@9.2.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@dhis2-ui/node/-/node-9.2.0.tgz#3560b3e7394d275c1bce3e800b2654cddcd2adb2" - integrity sha512-xx7P/6V7vq3JLXUUATKGGUCORHqQL74fsGYUd9a0izyUyq4h3pEHL9ZT6Cel+A0d5ODYn/j/Q6fHICZzg55FBQ== +"@dhis2-ui/node@9.4.4": + version "9.4.4" + resolved "https://registry.yarnpkg.com/@dhis2-ui/node/-/node-9.4.4.tgz#3c13b7424a172564a0d52893b4d1ac8a7d9ceac3" + integrity sha512-8kyvwqFc/cx1U50AhDymUnKR3OvWy6/EBnt8IOGrdFGrIRTk6P+JiRFUMfQ2aRubhtLMsDTpQ3LOMeHeP7/87w== dependencies: - "@dhis2-ui/loader" "9.2.0" + "@dhis2-ui/loader" "9.4.4" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "9.2.0" + "@dhis2/ui-constants" "9.4.4" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/notice-box@9.2.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@dhis2-ui/notice-box/-/notice-box-9.2.0.tgz#8c1fb4a2a780fea0fde4b8f9eaf8f73957187c99" - integrity sha512-DY3WYXj1hsOsiBHGaNrOeZ8h7SPaXox6iMCTzL/jLvnfmTrH7wy6SHRLQYWg0BMrDflhMJu9qhn0jtzhEXZNMQ== +"@dhis2-ui/notice-box@9.4.4": + version "9.4.4" + resolved "https://registry.yarnpkg.com/@dhis2-ui/notice-box/-/notice-box-9.4.4.tgz#c333a0ffa0cddc20431071ec56f0521fa3dbcb5d" + integrity sha512-u7zcrq4EqCwCOszyl1FlfpeQj+Tn/UJ/J6mZ3v44+7gCTNMrEfT7Hf/drmTVLmFNquqDUP/ppr1uxwtQOResyA== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "9.2.0" - "@dhis2/ui-icons" "9.2.0" + "@dhis2/ui-constants" "9.4.4" + "@dhis2/ui-icons" "9.4.4" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/organisation-unit-tree@9.2.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@dhis2-ui/organisation-unit-tree/-/organisation-unit-tree-9.2.0.tgz#ce33d91361145d6574ddbef3866b56be06cee6cb" - integrity sha512-PHm908gNGPhq5D655BI4lrB+hMqfISKASjoFCWxG2f9FU64/pvQ+snZQQwQFMAJYMd6FKw4GOP1isKz0jTGNuA== +"@dhis2-ui/organisation-unit-tree@9.4.4": + version "9.4.4" + resolved "https://registry.yarnpkg.com/@dhis2-ui/organisation-unit-tree/-/organisation-unit-tree-9.4.4.tgz#3e952d2fe0fd045d6bc2a6a92872ef8e83a6e7f2" + integrity sha512-qUDsQIHPE2QQVizfs+bomsrlPKVrPi8L2MtKVkma2P1/GlDnZaOoLYB70zzLLbqH90dUbwMlGF3ZXnbIhi+A6g== dependencies: - "@dhis2-ui/checkbox" "9.2.0" - "@dhis2-ui/loader" "9.2.0" - "@dhis2-ui/node" "9.2.0" + "@dhis2-ui/checkbox" "9.4.4" + "@dhis2-ui/loader" "9.4.4" + "@dhis2-ui/node" "9.4.4" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "9.2.0" + "@dhis2/ui-constants" "9.4.4" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/pagination@9.2.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@dhis2-ui/pagination/-/pagination-9.2.0.tgz#f38d1ada2bc9f9795dae8f86c52d54f29889dd17" - integrity sha512-jXJNQ8JOPweeMFCsPXgAb8dAx8J/rNTnExL8WA6rfRDWujOojLp8Gu2MrH5jlHRpCBWIl+aJO1I/ZKHekQOeDg== +"@dhis2-ui/pagination@9.4.4": + version "9.4.4" + resolved "https://registry.yarnpkg.com/@dhis2-ui/pagination/-/pagination-9.4.4.tgz#35d4ab7e35a0a37d998fe51394ac1bda26b7052f" + integrity sha512-WnruI7k/wcXzZF84fWRcFhfA131p23NwkeUUbt45cm/36+SnDoYAl6Nbh1elEQpYu2jqMWVk2w82u37MT/usxg== dependencies: - "@dhis2-ui/button" "9.2.0" - "@dhis2-ui/select" "9.2.0" + "@dhis2-ui/button" "9.4.4" + "@dhis2-ui/select" "9.4.4" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "9.2.0" - "@dhis2/ui-icons" "9.2.0" + "@dhis2/ui-constants" "9.4.4" + "@dhis2/ui-icons" "9.4.4" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/popover@9.2.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@dhis2-ui/popover/-/popover-9.2.0.tgz#3eccd6abde1da72089aa5feda5669ce4d1aa6f7e" - integrity sha512-7g8AHPrzUuMuv2MXpX5HdwiyO+peSGoq7hg6rHN/VDasIUvGS7vbaV4Xbxfd32fNmpHceBV7gMga31hRNaKtgw== +"@dhis2-ui/popover@9.4.4": + version "9.4.4" + resolved "https://registry.yarnpkg.com/@dhis2-ui/popover/-/popover-9.4.4.tgz#547dbffefbfdd838bf401a5a44e1e524ab028440" + integrity sha512-UosiUkknLNl3h+IuqNiEcLuGSskP8SV55BOUHEHIyE5HacRVjzyeKyK6ak/g0L8FyscYdpPvAAUqFRq7pnByzg== dependencies: - "@dhis2-ui/layer" "9.2.0" - "@dhis2-ui/popper" "9.2.0" + "@dhis2-ui/layer" "9.4.4" + "@dhis2-ui/popper" "9.4.4" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "9.2.0" + "@dhis2/ui-constants" "9.4.4" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/popper@9.2.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@dhis2-ui/popper/-/popper-9.2.0.tgz#6d17ca49d7f0496289e11315d414095d93d179b5" - integrity sha512-6xWNvUQaDu8VE4rCa+uYOheb/4BD/52Cs23w2yt4lLAVrym4kV+0cnpHtlEG1ZuuVrK/yHelMjrmYxn6yJE41Q== +"@dhis2-ui/popper@9.4.4": + version "9.4.4" + resolved "https://registry.yarnpkg.com/@dhis2-ui/popper/-/popper-9.4.4.tgz#84d3e2155d93bc54cebdf1430dc7b2f207d681ae" + integrity sha512-avSwb0Ty25mE7BkoV/dWvwxZFLEWOOkEXSa2z5F/YNfec8gvCODiVGcHU6CEBfDXk7y4dqv7QtLEfaeoa8cpnA== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "9.2.0" + "@dhis2/ui-constants" "9.4.4" "@popperjs/core" "^2.10.1" classnames "^2.3.1" prop-types "^15.7.2" react-popper "^2.2.5" resize-observer-polyfill "^1.5.1" -"@dhis2-ui/portal@9.2.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@dhis2-ui/portal/-/portal-9.2.0.tgz#12435f3a8886de685fc9ee4540639810eabf0191" - integrity sha512-a5DqmTG+pn4y1aXZWr8wEGlK4xRqdvnOWJVqO/6aebEn4ZtcPJT6yyXouviAM2yoW7+fDj6TZhKrZo3vgMLHlA== +"@dhis2-ui/portal@9.4.4": + version "9.4.4" + resolved "https://registry.yarnpkg.com/@dhis2-ui/portal/-/portal-9.4.4.tgz#8de12cd6c0e975b47cd19caae8acc1500034f206" + integrity sha512-HSXWzWFlSy9layr9zmxQcITiOIsse9y7bK0kPRlqjqEtSSfF57iGcFSAOTwX4HBW0xE/lQ8n4UfHoGOU76LF0Q== dependencies: classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/radio@9.2.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@dhis2-ui/radio/-/radio-9.2.0.tgz#9223ada90fe2d0eae375e85e0d99e6eb81d5269a" - integrity sha512-rjcz05spFlvRL8fnkO/7/ckznY4agQLl5P7UKSFL3Kz0KxvnocmounTX1BDsm6iQhKKt2HqJCYShpzPhTXavSA== +"@dhis2-ui/radio@9.4.4": + version "9.4.4" + resolved "https://registry.yarnpkg.com/@dhis2-ui/radio/-/radio-9.4.4.tgz#5654713ad8646aac31909ff6009b189975b3eaf5" + integrity sha512-JAqnlbX9arPASFNHJw8leeDs0FGKWvIOQDZeye9ApG8Xnl2vdu4Oa/8GfDPSPYHIGdvhx5VVH0D+PzAFLBeIUA== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "9.2.0" + "@dhis2/ui-constants" "9.4.4" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/required@9.2.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@dhis2-ui/required/-/required-9.2.0.tgz#8d76c914c3eb483958284c8ddf52ef7095cc2f42" - integrity sha512-cNoQct7gVbrAdzGDDFLnfBktmwmxAhD48oEZ6z4TE7IrPi2N+idqOiQCTEVKEWmuY7VGv9TV0I/1OLX6oiuSvA== +"@dhis2-ui/required@9.4.4": + version "9.4.4" + resolved "https://registry.yarnpkg.com/@dhis2-ui/required/-/required-9.4.4.tgz#fc167134d435a7ee4a86966887f282653e87f9f3" + integrity sha512-jwLwL+6y7Wp0IWiXyj28xmBpOsZOdyJlBUpdfmur7akVK46jMMTlugz36SpygU7f9dzExl2hJgDu01X8q/kdng== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "9.2.0" + "@dhis2/ui-constants" "9.4.4" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/segmented-control@9.2.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@dhis2-ui/segmented-control/-/segmented-control-9.2.0.tgz#2b230eea17e35194072544ebbfc68e2c896fb951" - integrity sha512-x4eDqGu4JFfFPQk06mg8YdUCjYeYyXCLmZ0gbGj1Zx03gxpMwb4/nVyGoAxZg31/IVkhBOeAwXlvt+ckNXovgw== +"@dhis2-ui/segmented-control@9.4.4": + version "9.4.4" + resolved "https://registry.yarnpkg.com/@dhis2-ui/segmented-control/-/segmented-control-9.4.4.tgz#8f4b756b913f5162f7523c4044be80a068584649" + integrity sha512-A8p8VxRea3VV4G9yWc+zTfQarW/ZDIfkEWzKzsmyQEuqIWlTVPf7Hcva9I7Lx1CiDpScJdJbK5vGlglj4PKj5g== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "9.2.0" + "@dhis2/ui-constants" "9.4.4" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/select@9.2.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@dhis2-ui/select/-/select-9.2.0.tgz#e854ecf6fd2580f9fb904301d1985923c1ade9cf" - integrity sha512-Hv0mRbpJNHJUa2lVivrWBt67iJ+4xTb7KxZkThISkmpQpzbWmhmJWlDbe0L+PdqOsaB2A70/N9HH4dhQyVP8vA== - dependencies: - "@dhis2-ui/box" "9.2.0" - "@dhis2-ui/button" "9.2.0" - "@dhis2-ui/card" "9.2.0" - "@dhis2-ui/checkbox" "9.2.0" - "@dhis2-ui/chip" "9.2.0" - "@dhis2-ui/field" "9.2.0" - "@dhis2-ui/input" "9.2.0" - "@dhis2-ui/layer" "9.2.0" - "@dhis2-ui/loader" "9.2.0" - "@dhis2-ui/popper" "9.2.0" - "@dhis2-ui/status-icon" "9.2.0" +"@dhis2-ui/select@9.4.4": + version "9.4.4" + resolved "https://registry.yarnpkg.com/@dhis2-ui/select/-/select-9.4.4.tgz#39e566dc565a07c783ca9c3be0ad15de2484eec4" + integrity sha512-qIJunqROPGcP9Ys/yx4D/jUS20DE8ORxT3W1l+r/RnL/z8gPlyBAYeYB914nxualIhoUYXr7UjhgyJZfQbIafQ== + dependencies: + "@dhis2-ui/box" "9.4.4" + "@dhis2-ui/button" "9.4.4" + "@dhis2-ui/card" "9.4.4" + "@dhis2-ui/checkbox" "9.4.4" + "@dhis2-ui/chip" "9.4.4" + "@dhis2-ui/field" "9.4.4" + "@dhis2-ui/input" "9.4.4" + "@dhis2-ui/layer" "9.4.4" + "@dhis2-ui/loader" "9.4.4" + "@dhis2-ui/popper" "9.4.4" + "@dhis2-ui/status-icon" "9.4.4" + "@dhis2-ui/tooltip" "9.4.4" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "9.2.0" - "@dhis2/ui-icons" "9.2.0" + "@dhis2/ui-constants" "9.4.4" + "@dhis2/ui-icons" "9.4.4" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/selector-bar@9.2.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@dhis2-ui/selector-bar/-/selector-bar-9.2.0.tgz#23790f850bee1142e7bdffd711a2dea27dc78112" - integrity sha512-HDb/XKuUdD82vDh5mgz+OWIwpKjyiZEqek74y8g2r/AsMIl5Fe2rOyncOUPpGctxYeVp9u3gAlkFbIHd/qpv/w== - dependencies: - "@dhis2-ui/button" "9.2.0" - "@dhis2-ui/card" "9.2.0" - "@dhis2-ui/layer" "9.2.0" - "@dhis2-ui/popper" "9.2.0" - "@dhis2/ui-constants" "9.2.0" - "@dhis2/ui-icons" "9.2.0" +"@dhis2-ui/selector-bar@9.4.4": + version "9.4.4" + resolved "https://registry.yarnpkg.com/@dhis2-ui/selector-bar/-/selector-bar-9.4.4.tgz#79513f90bdc1f4a2c6270cb8f2083dd14d4b11d9" + integrity sha512-9Z9dyrFU6XAEu0KLIa4TDQR/E8KJvjqMeaxWWpSrjnyM2Lmlfn9gH+qZ27TJSUMKqY/mdFJpSSr45aIQGgg2Rw== + dependencies: + "@dhis2-ui/button" "9.4.4" + "@dhis2-ui/card" "9.4.4" + "@dhis2-ui/layer" "9.4.4" + "@dhis2-ui/popper" "9.4.4" + "@dhis2/ui-constants" "9.4.4" + "@dhis2/ui-icons" "9.4.4" "@testing-library/react" "^12.1.2" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/sharing-dialog@9.2.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@dhis2-ui/sharing-dialog/-/sharing-dialog-9.2.0.tgz#8818e5119c2113b3a54add3bd56dfe55ad2fc52a" - integrity sha512-h7chsY8XM2kw06r52pGRjS8ZknuwiEkRxuBTXD77G1Loni5TMm6xr0OFr9nSQHSsbcbxydbo2WPRPAu6WjVyfg== - dependencies: - "@dhis2-ui/box" "9.2.0" - "@dhis2-ui/button" "9.2.0" - "@dhis2-ui/card" "9.2.0" - "@dhis2-ui/divider" "9.2.0" - "@dhis2-ui/input" "9.2.0" - "@dhis2-ui/layer" "9.2.0" - "@dhis2-ui/menu" "9.2.0" - "@dhis2-ui/modal" "9.2.0" - "@dhis2-ui/notice-box" "9.2.0" - "@dhis2-ui/popper" "9.2.0" - "@dhis2-ui/select" "9.2.0" - "@dhis2-ui/tab" "9.2.0" - "@dhis2-ui/tooltip" "9.2.0" - "@dhis2-ui/user-avatar" "9.2.0" +"@dhis2-ui/sharing-dialog@9.4.4": + version "9.4.4" + resolved "https://registry.yarnpkg.com/@dhis2-ui/sharing-dialog/-/sharing-dialog-9.4.4.tgz#dcb9aa7436cd037e59f02231eeece7fbf6d82414" + integrity sha512-pYhMR+HXu4gvpFTfwWIe1XtW7+m4DxVzWPHGmHKi7ZbVh42csi466mlpJ29qid8KBo/KmsNASt+R6Vp0I3Dq5w== + dependencies: + "@dhis2-ui/box" "9.4.4" + "@dhis2-ui/button" "9.4.4" + "@dhis2-ui/card" "9.4.4" + "@dhis2-ui/divider" "9.4.4" + "@dhis2-ui/input" "9.4.4" + "@dhis2-ui/layer" "9.4.4" + "@dhis2-ui/menu" "9.4.4" + "@dhis2-ui/modal" "9.4.4" + "@dhis2-ui/notice-box" "9.4.4" + "@dhis2-ui/popper" "9.4.4" + "@dhis2-ui/select" "9.4.4" + "@dhis2-ui/tab" "9.4.4" + "@dhis2-ui/tooltip" "9.4.4" + "@dhis2-ui/user-avatar" "9.4.4" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "9.2.0" - "@dhis2/ui-icons" "9.2.0" + "@dhis2/ui-constants" "9.4.4" + "@dhis2/ui-icons" "9.4.4" "@react-hook/size" "^2.1.2" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/status-icon@9.2.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@dhis2-ui/status-icon/-/status-icon-9.2.0.tgz#5686721ef7dc1b1cd1cca315b11136e0809e568f" - integrity sha512-oILHs38xICDU27C7CXgFAEttU4QJzg0wImKlX4XVJ5z1aGeq6qOW0RUVibF6JtyAppEi9XsYZ+AB1KLEGnDFJw== +"@dhis2-ui/status-icon@9.4.4": + version "9.4.4" + resolved "https://registry.yarnpkg.com/@dhis2-ui/status-icon/-/status-icon-9.4.4.tgz#ab44a615aee73a6f4edae6c2eeee017e9970b6c9" + integrity sha512-Hh/UueN9wrbpfrxegT7/712YlhZPlQ+fYDvPOty1GbAALDdPiMUg0F0YqonNXCeZUAuzX+mzxcxOoHk446GVaA== dependencies: - "@dhis2-ui/loader" "9.2.0" + "@dhis2-ui/loader" "9.4.4" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "9.2.0" - "@dhis2/ui-icons" "9.2.0" + "@dhis2/ui-constants" "9.4.4" + "@dhis2/ui-icons" "9.4.4" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/switch@9.2.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@dhis2-ui/switch/-/switch-9.2.0.tgz#1fc9ed88546906da11aa19348b8ba8ff2e7c8414" - integrity sha512-IwVUiqxMKZmx7VtEJkyHqGzy4tvRNh4qbhmrFodaH6d9YrbycaFNECbphrT1OywrUBuci0Q2LovZhYKInkeIFg== +"@dhis2-ui/switch@9.4.4": + version "9.4.4" + resolved "https://registry.yarnpkg.com/@dhis2-ui/switch/-/switch-9.4.4.tgz#181df81c21f369752bacabd62088b9531248ae13" + integrity sha512-MH3h3+EPtR9ZSq+fsFQSJkCxuKyzLZolcGCBPX2u+8sVmV+7AZ2P6yJ6YiAUGI9udMwZokLjPZSgp3QWwKEQQg== dependencies: - "@dhis2-ui/field" "9.2.0" - "@dhis2-ui/required" "9.2.0" + "@dhis2-ui/field" "9.4.4" + "@dhis2-ui/required" "9.4.4" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "9.2.0" + "@dhis2/ui-constants" "9.4.4" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/tab@9.2.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@dhis2-ui/tab/-/tab-9.2.0.tgz#910223a907f8c007921924138306b53c2014f0fd" - integrity sha512-zVxwQ7WgjcrCGd+qWzLx+OtTWlGOIuC+AuSknHz0wpGgW3vawr1rMDA6j129l4O+ezzPs5bw8vN3xUQORbj0Bg== +"@dhis2-ui/tab@9.4.4": + version "9.4.4" + resolved "https://registry.yarnpkg.com/@dhis2-ui/tab/-/tab-9.4.4.tgz#66ef74adf7e01c8a2f68327e0616795da1b7b064" + integrity sha512-2DqkH+IhiV4uFdvMg9aVJoao2D+U3s4kP+EsUlPPvRxvf2c7P6vjcitvACVgmDBnc2EWGw0jh02QhvOgQezhLA== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "9.2.0" - "@dhis2/ui-icons" "9.2.0" + "@dhis2/ui-constants" "9.4.4" + "@dhis2/ui-icons" "9.4.4" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/table@9.2.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@dhis2-ui/table/-/table-9.2.0.tgz#83d535e6c60ff9c9c3f436e592489a131caef772" - integrity sha512-wep8wPQKRg5vYPGg3HLAvsAEo+lUk3L7wO7axHyzx/XuHR40QXRirpv4tsFVn8VPpSFVq0w/BFGp8ijp3Y6RtA== +"@dhis2-ui/table@9.4.4": + version "9.4.4" + resolved "https://registry.yarnpkg.com/@dhis2-ui/table/-/table-9.4.4.tgz#b93c9ea878914df7dd3147f067c00ea946602fc4" + integrity sha512-i3f8go7JE/+7OyjWXN/ePlRduOC4Pc+9w4P+Sq3VOTFgYnMEPyVpZmz9/dgNtAGTto1Lh54ISU/wxwC+TXfRxw== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "9.2.0" - "@dhis2/ui-icons" "9.2.0" + "@dhis2/ui-constants" "9.4.4" + "@dhis2/ui-icons" "9.4.4" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/tag@9.2.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@dhis2-ui/tag/-/tag-9.2.0.tgz#c6a11fbdfc20151cc75c323e6a6b1470ef064e58" - integrity sha512-qt/FUIFPZkghfF/fhhLHr4oOl54d1Zwy4CKf4cZmO2DSd09h7E7cfIUxXaX/shRHsSmeUhrFP2Nv5LAvu8XVUg== +"@dhis2-ui/tag@9.4.4": + version "9.4.4" + resolved "https://registry.yarnpkg.com/@dhis2-ui/tag/-/tag-9.4.4.tgz#493a2369f384cb12f1104b18e34b54d516bce740" + integrity sha512-YMKndGKVXdQo5plKYy5RsN8AD233BbGZ9uzd/zmf7u2xs9C/DcK0JL+5UCZwVX++4swXTXbuSblE3Kl26a4U9Q== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "9.2.0" + "@dhis2/ui-constants" "9.4.4" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/text-area@9.2.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@dhis2-ui/text-area/-/text-area-9.2.0.tgz#75f279281f1513801148f11c2693537a5e9beed7" - integrity sha512-KLBlerlO3OvBvzTVKKolfghaAMjDPUZkxFsyRvWEIPh1RRxS9ZprunXpBWRkNO2I6U6uwqN0DiBLTNbh/zrafg== +"@dhis2-ui/text-area@9.4.4": + version "9.4.4" + resolved "https://registry.yarnpkg.com/@dhis2-ui/text-area/-/text-area-9.4.4.tgz#f5d6ee3fab9c2f71b129ea6ce4b3f7d7b36e3bf5" + integrity sha512-vphcZ42dqr2kXpAbJZPyJpr911B/3dAHM/PmUIIF07CzNs3daiEiIELm38KQ1cs0Na5oqXgrdw3HZyhAo02vsw== dependencies: - "@dhis2-ui/box" "9.2.0" - "@dhis2-ui/field" "9.2.0" - "@dhis2-ui/loader" "9.2.0" - "@dhis2-ui/status-icon" "9.2.0" + "@dhis2-ui/box" "9.4.4" + "@dhis2-ui/field" "9.4.4" + "@dhis2-ui/loader" "9.4.4" + "@dhis2-ui/status-icon" "9.4.4" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "9.2.0" - "@dhis2/ui-icons" "9.2.0" + "@dhis2/ui-constants" "9.4.4" + "@dhis2/ui-icons" "9.4.4" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/tooltip@9.2.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@dhis2-ui/tooltip/-/tooltip-9.2.0.tgz#e7a0827d9ca6b30b69073916f7801d01fb7c9793" - integrity sha512-7Gb/Occ5/Bju95dnxUGzt/Q4129zqGWrxu1+S2uhc0YPRSx83JcG0MivPsVsr0BeU+p+8xwTVdGBOhMmqLpL9Q== +"@dhis2-ui/tooltip@9.4.4": + version "9.4.4" + resolved "https://registry.yarnpkg.com/@dhis2-ui/tooltip/-/tooltip-9.4.4.tgz#268c4d0a395669522d45dd0a5720c18589887929" + integrity sha512-qCHsGMuzL9YV3OnWw0j+tK0p5e+tzUd5g7CXbHPsrhtsctgKO5u/VWYnFaJlFh2cbctqvFPpS+buLMe1jndpjw== dependencies: - "@dhis2-ui/popper" "9.2.0" - "@dhis2-ui/portal" "9.2.0" + "@dhis2-ui/popper" "9.4.4" + "@dhis2-ui/portal" "9.4.4" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "9.2.0" + "@dhis2/ui-constants" "9.4.4" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/transfer@9.2.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@dhis2-ui/transfer/-/transfer-9.2.0.tgz#3624d08100b72143da5639ce231b53d57706ffdc" - integrity sha512-1+SdfeCBr+iOLaXf4gkpNLlysaBsWLOmlVzBdGVqFt4I4SMJrhFrCMUTz4A1Nsw7GpKGds35vGClQUe5LcuVSw== +"@dhis2-ui/transfer@9.4.4": + version "9.4.4" + resolved "https://registry.yarnpkg.com/@dhis2-ui/transfer/-/transfer-9.4.4.tgz#d3f45a4a41eb35363c3f6ac57f8d499dd0ac198b" + integrity sha512-JMw2VWbybqOx5+4Sh1C9cPeiWN8xS6+ZNUivEwxOpKv/TBpeRBowOV7q0QEfzE1fGC9qyJqVxevBQhcp+2aUaA== dependencies: - "@dhis2-ui/button" "9.2.0" - "@dhis2-ui/field" "9.2.0" - "@dhis2-ui/input" "9.2.0" - "@dhis2-ui/intersection-detector" "9.2.0" - "@dhis2-ui/loader" "9.2.0" + "@dhis2-ui/button" "9.4.4" + "@dhis2-ui/field" "9.4.4" + "@dhis2-ui/input" "9.4.4" + "@dhis2-ui/intersection-detector" "9.4.4" + "@dhis2-ui/loader" "9.4.4" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "9.2.0" + "@dhis2/ui-constants" "9.4.4" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/user-avatar@9.2.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@dhis2-ui/user-avatar/-/user-avatar-9.2.0.tgz#722b4bad239aff8eb2b639ca51bd6528a08da1e4" - integrity sha512-XRop5Mmc5q1GnrM3YgIEdjw0OX7/KA9ZdxRNS4AU7ifYMEjUNutYmq8a2bJ1M6eZfq2DrhRQui9/1E7MvK+Evw== +"@dhis2-ui/user-avatar@9.4.4": + version "9.4.4" + resolved "https://registry.yarnpkg.com/@dhis2-ui/user-avatar/-/user-avatar-9.4.4.tgz#cb97b581e288c9d6a99d5f98a66fa3c63a6b27be" + integrity sha512-GILxEnNh0KwTKEMf5RCIvwV/BOv9GUKstuyLt9o5lX7YhT8QfMC0Uwn+IMOHtV6RoaewLbn0zyZF30NlZGohwg== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "9.2.0" + "@dhis2/ui-constants" "9.4.4" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2/analytics@^26.6.9": - version "26.6.9" - resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-26.6.9.tgz#932847c4bee3dd720d5d0b872c6b11eeae8b260c" - integrity sha512-AcU5FKH1Rmi8GdgqdJ1aOPqTKhztLafhzKNvGBdb5rSNR8/KS2djyTxxPhL0fdusu+1Rc04RFSkOLajq3ChVrQ== +"@dhis2/analytics@^26.6.10": + version "26.6.10" + resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-26.6.10.tgz#669fab3007b609a3c1a692a8261c759198e7035f" + integrity sha512-RHBvMdAuoDpSwxcoBTSsTWlhTUy8nJbKCANbFnB3NcBjsh+XMhwFJSkCGnCKElkhWbrm9h8kZVobqv62p6W2cA== dependencies: "@dhis2/d2-ui-rich-text" "^7.4.1" "@dhis2/multi-calendar-dates" "1.0.0" @@ -2262,10 +2263,10 @@ "@js-temporal/polyfill" "^0.4.2" classnames "^2.3.2" -"@dhis2/multi-calendar-dates@1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@dhis2/multi-calendar-dates/-/multi-calendar-dates-1.0.2.tgz#e54dc85e512aba93fceef3004e67e199077f3ba8" - integrity sha512-oQZ7PFMwHFpt4ygDN9DmAeYO3g07L7AHJW6diZ37mzpkEF/DyMafhsZHnJWNlTH5HDp8nYuO3EjBiM7fZN6C0g== +"@dhis2/multi-calendar-dates@^1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@dhis2/multi-calendar-dates/-/multi-calendar-dates-1.1.1.tgz#fb76a77114ce0b757db7dd9f588d1a47809732da" + integrity sha512-kaisVuRGfdqY/Up6sWqgc81K67ymPVoRYgYRcT29z61ol2WhiTXTSTuRX/gDO1VKjmskeB5/badRrdLMf4BBUA== dependencies: "@js-temporal/polyfill" "^0.4.2" classnames "^2.3.2" @@ -2286,91 +2287,91 @@ workbox-routing "^6.1.5" workbox-strategies "^6.1.5" -"@dhis2/ui-constants@9.2.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@dhis2/ui-constants/-/ui-constants-9.2.0.tgz#47506acaec5e4ce28630519a630a05657d2d29f6" - integrity sha512-gMbnVJQJmCPoGJHnY09BoDe6Z1vukzFdUcm0HPYyijs8ZWnclLs+69iVamxhskOnNWgj8hEt/FVs4mfhMcW3Cg== +"@dhis2/ui-constants@9.4.4": + version "9.4.4" + resolved "https://registry.yarnpkg.com/@dhis2/ui-constants/-/ui-constants-9.4.4.tgz#4fe728f96fe92752b4a033b03f2fdb1313eafeb3" + integrity sha512-O+jHTT/S3jgcHP7gxcZenpMyOfBktvoB9MVGzoVaAW5rRbYe0cCSe1Zh70h25VMVhwxBTCTIR7G3uvDWcdb5Ww== dependencies: prop-types "^15.7.2" -"@dhis2/ui-forms@9.2.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@dhis2/ui-forms/-/ui-forms-9.2.0.tgz#a5651dc5010a495c8a52ef5484e7d44b2583b715" - integrity sha512-eodiPW+ahR5wVsgrl/bFvj2zyeJD+DR9woqys4ZyoaHlKjOdeLqDNbJDnrS+AmHfte5uorF/aWzmEZr825LBVg== - dependencies: - "@dhis2-ui/button" "9.2.0" - "@dhis2-ui/checkbox" "9.2.0" - "@dhis2-ui/field" "9.2.0" - "@dhis2-ui/file-input" "9.2.0" - "@dhis2-ui/input" "9.2.0" - "@dhis2-ui/radio" "9.2.0" - "@dhis2-ui/select" "9.2.0" - "@dhis2-ui/switch" "9.2.0" - "@dhis2-ui/text-area" "9.2.0" +"@dhis2/ui-forms@9.4.4": + version "9.4.4" + resolved "https://registry.yarnpkg.com/@dhis2/ui-forms/-/ui-forms-9.4.4.tgz#9104665d2a57429df89caac720c59ad509328515" + integrity sha512-4QU4NXlExBqHWfoWnKIpDHB3wahDnJYO1CdZ64UcVurjdGKQdiAbX/WbrFYSpWuk8gO/DqQ8AC7JkTtpXXF9Lg== + dependencies: + "@dhis2-ui/button" "9.4.4" + "@dhis2-ui/checkbox" "9.4.4" + "@dhis2-ui/field" "9.4.4" + "@dhis2-ui/file-input" "9.4.4" + "@dhis2-ui/input" "9.4.4" + "@dhis2-ui/radio" "9.4.4" + "@dhis2-ui/select" "9.4.4" + "@dhis2-ui/switch" "9.4.4" + "@dhis2-ui/text-area" "9.4.4" "@dhis2/prop-types" "^3.1.2" classnames "^2.3.1" final-form "^4.20.2" prop-types "^15.7.2" react-final-form "^6.5.3" -"@dhis2/ui-icons@9.2.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@dhis2/ui-icons/-/ui-icons-9.2.0.tgz#bddf5223cabec93c9499281b2181eb165346b639" - integrity sha512-g9993UGWVLwDcbV+wp3HqrK8AXFu49aped0GpZsQUlGbHIzEl1EgmjiII44N40VbXwVUnqIDmu99wBxpH5Gd+g== - -"@dhis2/ui@^8.12.3", "@dhis2/ui@^9.2.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@dhis2/ui/-/ui-9.2.0.tgz#33d474cbc7cd95f8a714e019d6c69e144f77f86b" - integrity sha512-nhKwW5bmIfQvt3L16PffFO2NsDk9BgYb91vHx06fPgM56UdwGYSejpax8eU29vE9urmHSkijSpnBqY4buZy6Ow== - dependencies: - "@dhis2-ui/alert" "9.2.0" - "@dhis2-ui/box" "9.2.0" - "@dhis2-ui/button" "9.2.0" - "@dhis2-ui/calendar" "9.2.0" - "@dhis2-ui/card" "9.2.0" - "@dhis2-ui/center" "9.2.0" - "@dhis2-ui/checkbox" "9.2.0" - "@dhis2-ui/chip" "9.2.0" - "@dhis2-ui/cover" "9.2.0" - "@dhis2-ui/css" "9.2.0" - "@dhis2-ui/divider" "9.2.0" - "@dhis2-ui/field" "9.2.0" - "@dhis2-ui/file-input" "9.2.0" - "@dhis2-ui/header-bar" "9.2.0" - "@dhis2-ui/help" "9.2.0" - "@dhis2-ui/input" "9.2.0" - "@dhis2-ui/intersection-detector" "9.2.0" - "@dhis2-ui/label" "9.2.0" - "@dhis2-ui/layer" "9.2.0" - "@dhis2-ui/legend" "9.2.0" - "@dhis2-ui/loader" "9.2.0" - "@dhis2-ui/logo" "9.2.0" - "@dhis2-ui/menu" "9.2.0" - "@dhis2-ui/modal" "9.2.0" - "@dhis2-ui/node" "9.2.0" - "@dhis2-ui/notice-box" "9.2.0" - "@dhis2-ui/organisation-unit-tree" "9.2.0" - "@dhis2-ui/pagination" "9.2.0" - "@dhis2-ui/popover" "9.2.0" - "@dhis2-ui/popper" "9.2.0" - "@dhis2-ui/portal" "9.2.0" - "@dhis2-ui/radio" "9.2.0" - "@dhis2-ui/required" "9.2.0" - "@dhis2-ui/segmented-control" "9.2.0" - "@dhis2-ui/select" "9.2.0" - "@dhis2-ui/selector-bar" "9.2.0" - "@dhis2-ui/sharing-dialog" "9.2.0" - "@dhis2-ui/switch" "9.2.0" - "@dhis2-ui/tab" "9.2.0" - "@dhis2-ui/table" "9.2.0" - "@dhis2-ui/tag" "9.2.0" - "@dhis2-ui/text-area" "9.2.0" - "@dhis2-ui/tooltip" "9.2.0" - "@dhis2-ui/transfer" "9.2.0" - "@dhis2-ui/user-avatar" "9.2.0" - "@dhis2/ui-constants" "9.2.0" - "@dhis2/ui-forms" "9.2.0" - "@dhis2/ui-icons" "9.2.0" +"@dhis2/ui-icons@9.4.4": + version "9.4.4" + resolved "https://registry.yarnpkg.com/@dhis2/ui-icons/-/ui-icons-9.4.4.tgz#c4f488496389687ebd47266e93e0aacf27054ef3" + integrity sha512-AGt+aYqpqb7f/2IH5quZ1bJoSz/WB3p7I1CdZHUPk/XP6rQpO2W7mqoLxiZYOHCiNlTU+sjfXcYauHaWZSTdjw== + +"@dhis2/ui@^8.12.3", "@dhis2/ui@^9.2.0", "@dhis2/ui@^9.4.4": + version "9.4.4" + resolved "https://registry.yarnpkg.com/@dhis2/ui/-/ui-9.4.4.tgz#ae7961d42753d72e209f7d11b160b3179e6a6452" + integrity sha512-w1NMZy/S5tNbXGt7F5J5OM1P8qgq1Bo1ifV34YV3Cs+8rJYkHHsFOokUN+wSTdXUWqIKxOGrRoQkmgmjQ19WlA== + dependencies: + "@dhis2-ui/alert" "9.4.4" + "@dhis2-ui/box" "9.4.4" + "@dhis2-ui/button" "9.4.4" + "@dhis2-ui/calendar" "9.4.4" + "@dhis2-ui/card" "9.4.4" + "@dhis2-ui/center" "9.4.4" + "@dhis2-ui/checkbox" "9.4.4" + "@dhis2-ui/chip" "9.4.4" + "@dhis2-ui/cover" "9.4.4" + "@dhis2-ui/css" "9.4.4" + "@dhis2-ui/divider" "9.4.4" + "@dhis2-ui/field" "9.4.4" + "@dhis2-ui/file-input" "9.4.4" + "@dhis2-ui/header-bar" "9.4.4" + "@dhis2-ui/help" "9.4.4" + "@dhis2-ui/input" "9.4.4" + "@dhis2-ui/intersection-detector" "9.4.4" + "@dhis2-ui/label" "9.4.4" + "@dhis2-ui/layer" "9.4.4" + "@dhis2-ui/legend" "9.4.4" + "@dhis2-ui/loader" "9.4.4" + "@dhis2-ui/logo" "9.4.4" + "@dhis2-ui/menu" "9.4.4" + "@dhis2-ui/modal" "9.4.4" + "@dhis2-ui/node" "9.4.4" + "@dhis2-ui/notice-box" "9.4.4" + "@dhis2-ui/organisation-unit-tree" "9.4.4" + "@dhis2-ui/pagination" "9.4.4" + "@dhis2-ui/popover" "9.4.4" + "@dhis2-ui/popper" "9.4.4" + "@dhis2-ui/portal" "9.4.4" + "@dhis2-ui/radio" "9.4.4" + "@dhis2-ui/required" "9.4.4" + "@dhis2-ui/segmented-control" "9.4.4" + "@dhis2-ui/select" "9.4.4" + "@dhis2-ui/selector-bar" "9.4.4" + "@dhis2-ui/sharing-dialog" "9.4.4" + "@dhis2-ui/switch" "9.4.4" + "@dhis2-ui/tab" "9.4.4" + "@dhis2-ui/table" "9.4.4" + "@dhis2-ui/tag" "9.4.4" + "@dhis2-ui/text-area" "9.4.4" + "@dhis2-ui/tooltip" "9.4.4" + "@dhis2-ui/transfer" "9.4.4" + "@dhis2-ui/user-avatar" "9.4.4" + "@dhis2/ui-constants" "9.4.4" + "@dhis2/ui-forms" "9.4.4" + "@dhis2/ui-icons" "9.4.4" prop-types "^15.7.2" "@dnd-kit/accessibility@^3.0.0": From 545565b4d5ba60ab84c25e106af33a16d307aeed Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Sun, 19 May 2024 03:41:04 +0200 Subject: [PATCH 03/11] fix(translations): sync translations from transifex (dev) Automatically merged. --- i18n/ar.po | 19 ++++++++----------- i18n/cs.po | 19 ++++++++----------- i18n/es.po | 17 +++++++---------- i18n/fr.po | 26 ++++++++++++-------------- i18n/id.po | 13 +++++-------- i18n/lo.po | 23 ++++++++++------------- i18n/nb.po | 17 +++++++---------- i18n/nl.po | 17 +++++++---------- 8 files changed, 64 insertions(+), 87 deletions(-) diff --git a/i18n/ar.po b/i18n/ar.po index 404402427d..7770073d21 100644 --- a/i18n/ar.po +++ b/i18n/ar.po @@ -1,16 +1,16 @@ # # Translators: # KRG HIS , 2020 -# Philip Larsen Donnelly, 2020 # Hamza Assada <7amza.it@gmail.com>, 2022 # Viktor Varland , 2022 +# Philip Larsen Donnelly, 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" "POT-Creation-Date: 2024-03-01T08:28:43.727Z\n" "PO-Revision-Date: 2019-06-25 18:46+0000\n" -"Last-Translator: Viktor Varland , 2022\n" +"Last-Translator: Philip Larsen Donnelly, 2024\n" "Language-Team: Arabic (https://app.transifex.com/hisp-uio/teams/100509/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -163,14 +163,8 @@ msgstr "تحميل" msgid "Hide" msgstr "إخفاء" -msgid "All" -msgstr "الجميع" - -msgid "{{total}} of {{axisMaxNumberOfItems}} selected" -msgstr "{{total}} من {{axisMaxNumberOfItems}} تم تحديدها" - -msgid "{{total}} selected" -msgstr "{{total}} تم تحديدها" +msgid "all" +msgstr "" msgid "{{dimensionName}} is locked to {{axisName}} for {{visTypeName}}" msgstr "{{dimensionName}} مقفل على {{axisName}} لـ {{visTypeName}}" @@ -470,6 +464,9 @@ msgstr "بعد الأخير" msgid "Before first and after last" msgstr "قبل الأول وبعد الأخير" +msgid "All" +msgstr "الجميع" + msgid "Hide empty rows" msgstr "إخفاء الصفوف الفارغة" @@ -729,7 +726,7 @@ msgstr "" "منفصلة." msgid "Category option combination" -msgstr "" +msgstr "مزيج خيارات الفئة" msgid "Absolute deviation" msgstr "" diff --git a/i18n/cs.po b/i18n/cs.po index 15ab75cc84..15fc459492 100644 --- a/i18n/cs.po +++ b/i18n/cs.po @@ -164,14 +164,8 @@ msgstr "Stáhnout" msgid "Hide" msgstr "Skrýt" -msgid "All" -msgstr "Vše" - -msgid "{{total}} of {{axisMaxNumberOfItems}} selected" -msgstr "Je vybráno {{total}} z {{axisMaxNumberOfItems}}" - -msgid "{{total}} selected" -msgstr "Vybráno: {{total}}" +msgid "all" +msgstr "vše" msgid "{{dimensionName}} is locked to {{axisName}} for {{visTypeName}}" msgstr "{{dimensionName}} je pro {{visTypeName}} uzamčen na {{axisName}}" @@ -472,6 +466,9 @@ msgstr "Po poslední" msgid "Before first and after last" msgstr "Před první a po poslední" +msgid "All" +msgstr "Vše" + msgid "Hide empty rows" msgstr "Skrýt prázdné řádky" @@ -761,7 +758,7 @@ msgid "" msgstr "" msgid "Median" -msgstr "" +msgstr "Medián" msgid "" "The middle value in a dataset when the values are arranged in ascending or " @@ -780,7 +777,7 @@ msgid "" msgstr "" msgid "Z-score" -msgstr "" +msgstr "Z-score" msgid "" "A measure of how many standard deviations a data point is from the mean of a" @@ -789,7 +786,7 @@ msgid "" msgstr "" msgid "Mean" -msgstr "" +msgstr "Střední" msgid "Average of the value over time." msgstr "" diff --git a/i18n/es.po b/i18n/es.po index f919e03f37..b991d4974d 100644 --- a/i18n/es.po +++ b/i18n/es.po @@ -6,16 +6,16 @@ # Prabhjot Singh, 2021 # Viktor Varland , 2021 # Carlos Tejo Alonso, 2022 -# Enzo Nicolas Rossi , 2024 # Philip Larsen Donnelly, 2024 # Janeth Cruz, 2024 +# Enzo Nicolas Rossi , 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" "POT-Creation-Date: 2024-03-01T08:28:43.727Z\n" "PO-Revision-Date: 2019-06-25 18:46+0000\n" -"Last-Translator: Janeth Cruz, 2024\n" +"Last-Translator: Enzo Nicolas Rossi , 2024\n" "Language-Team: Spanish (https://app.transifex.com/hisp-uio/teams/100509/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -176,14 +176,8 @@ msgstr "Descargar" msgid "Hide" msgstr "Ocultar" -msgid "All" -msgstr "Todos" - -msgid "{{total}} of {{axisMaxNumberOfItems}} selected" -msgstr "{{total}} de {{axisMaxNumberOfItems}} seleccionados" - -msgid "{{total}} selected" -msgstr "{{total}} seleccionado" +msgid "all" +msgstr "todo" msgid "{{dimensionName}} is locked to {{axisName}} for {{visTypeName}}" msgstr "{{dimensionName}} está bloqueado en {{axisName}} para {{visTypeName}}" @@ -487,6 +481,9 @@ msgstr "Después del último" msgid "Before first and after last" msgstr "Antes del primero y después del último" +msgid "All" +msgstr "Todos" + msgid "Hide empty rows" msgstr "Ocultar filas vacías" diff --git a/i18n/fr.po b/i18n/fr.po index fcf5fbe4d0..527e1b7294 100644 --- a/i18n/fr.po +++ b/i18n/fr.po @@ -2,21 +2,22 @@ # Translators: # Bram Piot , 2019 # Matthieu Pinard , 2019 -# Karoline Tufte Lien , 2020 # Djibril Dione , 2020 # Gabriela Rodriguez , 2020 # Viktor Varland , 2021 -# Yao Selom SAKA (HISP WCA) , 2022 # Edem Kossi , 2023 # Philip Larsen Donnelly, 2024 # Yayra Gomado , 2024 +# Karoline Tufte Lien , 2024 +# Yury Rogachev , 2024 +# Yao Selom SAKA (HISP WCA) , 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" "POT-Creation-Date: 2024-03-01T08:28:43.727Z\n" "PO-Revision-Date: 2019-06-25 18:46+0000\n" -"Last-Translator: Yayra Gomado , 2024\n" +"Last-Translator: Yao Selom SAKA (HISP WCA) , 2024\n" "Language-Team: French (https://app.transifex.com/hisp-uio/teams/100509/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -173,15 +174,9 @@ msgstr "Télécharger" msgid "Hide" msgstr "Masquer" -msgid "All" +msgid "all" msgstr "Tout" -msgid "{{total}} of {{axisMaxNumberOfItems}} selected" -msgstr "{{total}} de {{axisMaxNumberOfItems}} choisis" - -msgid "{{total}} selected" -msgstr "{{total}} choisis" - msgid "{{dimensionName}} is locked to {{axisName}} for {{visTypeName}}" msgstr "" "{{dimensionName}} est verrouillé sur {{axisName}} pour {{visTypeName}}" @@ -486,6 +481,9 @@ msgstr "Après dernier" msgid "Before first and after last" msgstr "Avant premier et après dernier " +msgid "All" +msgstr "Tout" + msgid "Hide empty rows" msgstr "Masquer lignes vides" @@ -760,7 +758,7 @@ msgstr "" "données utilisent des couches de carte distinctes." msgid "Category option combination" -msgstr "" +msgstr "Combinaison d'option de catégorie" msgid "Absolute deviation" msgstr "" @@ -778,7 +776,7 @@ msgid "" msgstr "" msgid "Median" -msgstr "" +msgstr "Médian" msgid "" "The middle value in a dataset when the values are arranged in ascending or " @@ -797,7 +795,7 @@ msgid "" msgstr "" msgid "Z-score" -msgstr "" +msgstr "Z-score" msgid "" "A measure of how many standard deviations a data point is from the mean of a" @@ -806,7 +804,7 @@ msgid "" msgstr "" msgid "Mean" -msgstr "" +msgstr "Moyenne" msgid "Average of the value over time." msgstr "" diff --git a/i18n/id.po b/i18n/id.po index fa8721527d..12b49292a7 100644 --- a/i18n/id.po +++ b/i18n/id.po @@ -169,14 +169,8 @@ msgstr "Unduh" msgid "Hide" msgstr "Sembunyikan" -msgid "All" -msgstr "Semua" - -msgid "{{total}} of {{axisMaxNumberOfItems}} selected" -msgstr "{{total}} dari {{axisMaxNumberOfItems}} terpilih" - -msgid "{{total}} selected" -msgstr "{{total}} terpilih" +msgid "all" +msgstr "" msgid "{{dimensionName}} is locked to {{axisName}} for {{visTypeName}}" msgstr "{{dimensionName}} dikunci sebagai {{axisName}} untuk {{visTypeName}}" @@ -479,6 +473,9 @@ msgstr "Setelah terakhir" msgid "Before first and after last" msgstr "Sebelum yang pertama dan sesudah yang terakhir" +msgid "All" +msgstr "Semua" + msgid "Hide empty rows" msgstr "Sembunyikan baris kosong" diff --git a/i18n/lo.po b/i18n/lo.po index c62069921a..d17419ce1a 100644 --- a/i18n/lo.po +++ b/i18n/lo.po @@ -21,7 +21,7 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" msgid "All items" -msgstr "" +msgstr "ລາຍການທັງໝົດ" msgid "Rename successful" msgstr "" @@ -79,16 +79,16 @@ msgid "Horizontal" msgstr "" msgid "Main dimensions" -msgstr "" +msgstr "ຕົວຕອງທີ່ສຳຄັນ" msgid "Other dimensions" msgstr "" msgid "Your dimensions" -msgstr "" +msgstr "ຂະໜາດຂອງທ່ານ" msgid "Filter dimensions" -msgstr "" +msgstr "ຂະໜາດຕົວຕອງ" msgid "Data value set" msgstr "ການຕັ້ງຄ່າຂໍ້ມູນ" @@ -162,13 +162,7 @@ msgstr "ດາວໂຫຼດ" msgid "Hide" msgstr "ເຊື່ອງ" -msgid "All" -msgstr "ທັງໝົດ" - -msgid "{{total}} of {{axisMaxNumberOfItems}} selected" -msgstr "" - -msgid "{{total}} selected" +msgid "all" msgstr "" msgid "{{dimensionName}} is locked to {{axisName}} for {{visTypeName}}" @@ -465,6 +459,9 @@ msgstr "ຫຼັງຈາກສຸດທ້າຍ" msgid "Before first and after last" msgstr "ກ່ອນໜ້າທໍາອິດ ແລະ ຫຼັງຈາກສຸດທ້າຍ" +msgid "All" +msgstr "ທັງໝົດ" + msgid "Hide empty rows" msgstr "ເຊື່ອງແຖວທີ່ເປົ່າຫວ່າງ" @@ -628,7 +625,7 @@ msgid "Visualization type" msgstr "" msgid "Axis {{axisId}}" -msgstr "" +msgstr "ແກນ {{axisId}}" msgid "Series is empty" msgstr "" @@ -1024,7 +1021,7 @@ msgid "Last 5 years" msgstr "5 ປີຍ້ອນຫຼັງ" msgid "User organisation unit" -msgstr "" +msgstr "ຫນ່ວຍງານອົງການຈັດຕັ້ງຂອງຜູ້ໃຊ້" msgid "User sub-units" msgstr "ຫົວໜ່ວຍຍ່ອຍຂອງທ່ານ" diff --git a/i18n/nb.po b/i18n/nb.po index 21b97f3ebf..d829252a13 100644 --- a/i18n/nb.po +++ b/i18n/nb.po @@ -2,15 +2,15 @@ # Translators: # Caroline Hesthagen Holen , 2022 # Jan Henrik Øverland, 2024 -# Karoline Tufte Lien , 2024 # Martin , 2024 +# Karoline Tufte Lien , 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" "POT-Creation-Date: 2024-03-01T08:28:43.727Z\n" "PO-Revision-Date: 2019-06-25 18:46+0000\n" -"Last-Translator: Martin , 2024\n" +"Last-Translator: Karoline Tufte Lien , 2024\n" "Language-Team: Norwegian Bokmål (https://app.transifex.com/hisp-uio/teams/100509/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -166,14 +166,8 @@ msgstr "Last ned" msgid "Hide" msgstr "Skjul" -msgid "All" -msgstr "Alt" - -msgid "{{total}} of {{axisMaxNumberOfItems}} selected" -msgstr "{{total}} av {{axisMaxNumberOfItems}} valgt" - -msgid "{{total}} selected" -msgstr "{{total}} valgt" +msgid "all" +msgstr "alle" msgid "{{dimensionName}} is locked to {{axisName}} for {{visTypeName}}" msgstr "{{dimensionName}} er låst til {{axisName}} for {{visTypeName}}" @@ -476,6 +470,9 @@ msgstr "Etter siste" msgid "Before first and after last" msgstr "Før første og etter siste" +msgid "All" +msgstr "Alt" + msgid "Hide empty rows" msgstr "Skjul tomme rader" diff --git a/i18n/nl.po b/i18n/nl.po index ea2778502c..972e4491a7 100644 --- a/i18n/nl.po +++ b/i18n/nl.po @@ -2,17 +2,17 @@ # Translators: # Cherise Beek , 2021 # Yury Rogachev , 2021 -# Charel van den Elsen, 2023 # Enzo Nicolas Rossi , 2023 # Philip Larsen Donnelly, 2024 # Rica Zamora Duchateau, 2024 +# Charel van den Elsen, 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" "POT-Creation-Date: 2024-03-01T08:28:43.727Z\n" "PO-Revision-Date: 2019-06-25 18:46+0000\n" -"Last-Translator: Rica Zamora Duchateau, 2024\n" +"Last-Translator: Charel van den Elsen, 2024\n" "Language-Team: Dutch (https://app.transifex.com/hisp-uio/teams/100509/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -169,14 +169,8 @@ msgstr "Download" msgid "Hide" msgstr "Verbergen" -msgid "All" -msgstr "Alle" - -msgid "{{total}} of {{axisMaxNumberOfItems}} selected" -msgstr "{{total}} van {{axisMaxNumberOfItems}} geselecteerd" - -msgid "{{total}} selected" -msgstr "{{total}} geselecteerd" +msgid "all" +msgstr "alle" msgid "{{dimensionName}} is locked to {{axisName}} for {{visTypeName}}" msgstr "" @@ -475,6 +469,9 @@ msgstr "" msgid "Before first and after last" msgstr "Voor eerste en na laatste" +msgid "All" +msgstr "Alle" + msgid "Hide empty rows" msgstr "Verberg lege rijen" From 34479f1a12659b4d383b9d3187b6c1fa27d5ccc9 Mon Sep 17 00:00:00 2001 From: Martin Date: Thu, 30 May 2024 17:10:16 +0300 Subject: [PATCH 04/11] fix: non-existing AO blocks new AOs from being created (DHIS2-13167) (#3056) --- src/actions/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/actions/index.js b/src/actions/index.js index 6e525c9d0e..46a7576726 100644 --- a/src/actions/index.js +++ b/src/actions/index.js @@ -109,6 +109,7 @@ export const tDoLoadVisualization = if (errorResponse?.details?.httpStatusCode === 404) { error = new VisualizationNotFoundError() + history.push('/') } else if (errorResponse?.message) { error = errorResponse.message } else { From e7abbc3fed98cb12815fceeff4f435fb0962fa2c Mon Sep 17 00:00:00 2001 From: Mozafar Haider Date: Fri, 9 Feb 2024 17:05:09 +0000 Subject: [PATCH 05/11] feat(DHIS2-16777): support right-to-left languages (automatic css updates) --- src/components/App.css | 12 ++-- .../AxesTabs/styles/AxesTabs.module.css | 7 +- .../styles/DetailsPanel.module.css | 2 +- .../Dialogs/styles/DialogManager.module.css | 2 +- .../styles/DndDimensionList.module.css | 19 +++--- .../styles/DndDimensionsPanel.module.css | 9 ++- .../ModalDownloadDropdown.module.css | 4 +- .../styles/DefaultAxis.module.css | 2 +- .../Snackbar/styles/Snackbar.module.css | 4 +- .../styles/VerticalTab.module.css | 4 +- .../styles/VerticalTabBar.module.css | 6 +- .../styles/StartScreen.module.css | 68 +++++++++++++------ .../styles/AxisRange.module.css | 2 +- .../styles/Outliers.module.css | 7 +- .../styles/SeriesTable.module.css | 43 +++++++----- .../styles/TextStyle.module.css | 20 ++++-- .../styles/VisualizationOptions.style.js | 32 +++++---- .../styles/OutlierTablePlugin.module.css | 6 +- .../styles/PivotPlugin.style.js | 4 +- .../styles/VisualizationPlugin.module.css | 26 ++++--- .../VisualizationTypeSelector.module.css | 48 ++++++++----- src/components/scrollbar.css | 6 +- src/widgets/styles/LoadingMask.module.css | 4 +- 23 files changed, 204 insertions(+), 133 deletions(-) diff --git a/src/components/App.css b/src/components/App.css index 9508d24b08..fd418e559c 100644 --- a/src/components/App.css +++ b/src/components/App.css @@ -1,7 +1,7 @@ /* App */ .data-visualizer-app { - height: 100%; + block-size: 100%; background-color: var(--colors-grey300); overflow: hidden; } @@ -34,7 +34,7 @@ body { /* Headerbar */ .section-headerbar { - height: 48px; + block-size: 48px; } /* Main */ @@ -43,14 +43,14 @@ body { } .main-left { - min-width: 260px; + min-inline-size: 260px; } .main-right { flex: 1 1 0%; - max-width: 380px; + max-inline-size: 380px; background-color: var(--colors-grey100); - border-left: 1px solid var(--colors-grey400); + border-inline-start: 1px solid var(--colors-grey400); box-shadow: 1px 0 -2px 0 rgba(0, 0, 0, 0.03); overflow-y: auto; overflow-x: hidden; @@ -61,7 +61,7 @@ body { .main-center-canvas { display: flex; justify-content: center; - height: 100%; + block-size: 100%; overflow: hidden; position: relative; } diff --git a/src/components/AxesTabs/styles/AxesTabs.module.css b/src/components/AxesTabs/styles/AxesTabs.module.css index c7486512cf..651fd2745f 100644 --- a/src/components/AxesTabs/styles/AxesTabs.module.css +++ b/src/components/AxesTabs/styles/AxesTabs.module.css @@ -1,11 +1,10 @@ .tabs { - width: 200px; + inline-size: 200px; position: absolute; - top: 136px; /* modal title + horizontal tab bar height */ - bottom: 84px; /* modal actions section height */ + inset-block: 136px 84px; /* modal title + horizontal tab bar height */ /* modal actions section height */ z-index: 1; } .content { - margin-left: 200px; + margin-inline-start: 200px; } diff --git a/src/components/DetailsPanel/styles/DetailsPanel.module.css b/src/components/DetailsPanel/styles/DetailsPanel.module.css index 2106c40f9a..96144e10a8 100644 --- a/src/components/DetailsPanel/styles/DetailsPanel.module.css +++ b/src/components/DetailsPanel/styles/DetailsPanel.module.css @@ -1,3 +1,3 @@ .panel { - width: 380px; + inline-size: 380px; } diff --git a/src/components/DimensionsPanel/Dialogs/styles/DialogManager.module.css b/src/components/DimensionsPanel/Dialogs/styles/DialogManager.module.css index 1381c380c3..912063c86c 100644 --- a/src/components/DimensionsPanel/Dialogs/styles/DialogManager.module.css +++ b/src/components/DimensionsPanel/Dialogs/styles/DialogManager.module.css @@ -1,3 +1,3 @@ .tabs { - padding-bottom: var(--spacers-dp16); + padding-block-end: var(--spacers-dp16); } diff --git a/src/components/DimensionsPanel/styles/DndDimensionList.module.css b/src/components/DimensionsPanel/styles/DndDimensionList.module.css index 37f4d0b203..d57f26d2b1 100644 --- a/src/components/DimensionsPanel/styles/DndDimensionList.module.css +++ b/src/components/DimensionsPanel/styles/DndDimensionList.module.css @@ -1,19 +1,19 @@ .container { position: relative; flex: 1 1 0%; - min-height: 30vh; + min-block-size: 30vh; } .wrapper { position: absolute; - width: 100%; - height: 100%; + inline-size: 100%; + block-size: 100%; overflow: auto; - margin-top: 0px; + margin-block-start: 0px; padding: var(--spacers-dp8); background: var(--colors-white); - border-top: 1px solid var(--colors-grey300); - border-bottom: 1px solid var(--colors-grey300); + border-block-start: 1px solid var(--colors-grey300); + border-block-end: 1px solid var(--colors-grey300); } .list { @@ -28,11 +28,14 @@ text-transform: uppercase; font-size: 11px; color: var(--colors-grey600); - margin: 0 0 var(--spacers-dp8) 0; + margin-block-start: 0; + margin-block-end: var(--spacers-dp8); + margin-inline-start: 0; + margin-inline-end: 0; letter-spacing: 0.3px; font-weight: 400; } .section:not(:last-child) { - margin-bottom: var(--spacers-dp24); + margin-block-end: var(--spacers-dp24); } diff --git a/src/components/DimensionsPanel/styles/DndDimensionsPanel.module.css b/src/components/DimensionsPanel/styles/DndDimensionsPanel.module.css index 4b4d930f76..1adc0f539a 100644 --- a/src/components/DimensionsPanel/styles/DndDimensionsPanel.module.css +++ b/src/components/DimensionsPanel/styles/DndDimensionsPanel.module.css @@ -1,15 +1,18 @@ .container { - height: 100%; + block-size: 100%; display: flex; flex-direction: column; background-color: var(--colors-grey100); - border-right: 1px solid var(--colors-grey400); + border-inline-end: 1px solid var(--colors-grey400); box-shadow: 1px 0 2px 0 rgba(0, 0, 0, 0.03); padding: 0; overflow: hidden; } .filter { - padding: var(--spacers-dp8) var(--spacers-dp8) 0 var(--spacers-dp8); + padding-block-start: var(--spacers-dp8); + padding-block-end: 0; + padding-inline-start: var(--spacers-dp8); + padding-inline-end: var(--spacers-dp8); background: var(--colors-white); } diff --git a/src/components/DownloadMenu/ModalDownloadDropdown.module.css b/src/components/DownloadMenu/ModalDownloadDropdown.module.css index 55c5ecaf22..3e39ed3d78 100644 --- a/src/components/DownloadMenu/ModalDownloadDropdown.module.css +++ b/src/components/DownloadMenu/ModalDownloadDropdown.module.css @@ -1,4 +1,4 @@ .container { - margin-top: var(--spacers-dp12); - margin-bottom: var(--spacers-dp16); + margin-block-start: var(--spacers-dp12); + margin-block-end: var(--spacers-dp16); } diff --git a/src/components/Layout/DefaultLayout/styles/DefaultAxis.module.css b/src/components/Layout/DefaultLayout/styles/DefaultAxis.module.css index 2f3ba96073..a93dc8f8c5 100644 --- a/src/components/Layout/DefaultLayout/styles/DefaultAxis.module.css +++ b/src/components/Layout/DefaultLayout/styles/DefaultAxis.module.css @@ -1,5 +1,5 @@ .content { - width: 100%; + inline-size: 100%; display: flex; align-items: flex-start; align-content: flex-start; diff --git a/src/components/Snackbar/styles/Snackbar.module.css b/src/components/Snackbar/styles/Snackbar.module.css index b3036dffa8..d43abf9bec 100644 --- a/src/components/Snackbar/styles/Snackbar.module.css +++ b/src/components/Snackbar/styles/Snackbar.module.css @@ -1,6 +1,6 @@ .container { position: fixed; - bottom: 0; - left: 50%; + inset-block-end: 0; + inset-inline-start: 50%; transform: translateX(-50%); } diff --git a/src/components/VerticalTabBar/styles/VerticalTab.module.css b/src/components/VerticalTabBar/styles/VerticalTab.module.css index c20065f2c3..b1559e597e 100644 --- a/src/components/VerticalTabBar/styles/VerticalTab.module.css +++ b/src/components/VerticalTabBar/styles/VerticalTab.module.css @@ -10,7 +10,7 @@ .selected, .selected:hover { background: var(--colors-blue050); - border-right: 4px solid var(--colors-blue700); + border-inline-end: 4px solid var(--colors-blue700); color: var(--colors-blue700); - margin-right: -1px; + margin-inline-end: -1px; } diff --git a/src/components/VerticalTabBar/styles/VerticalTabBar.module.css b/src/components/VerticalTabBar/styles/VerticalTabBar.module.css index 2d360c238f..189e7d33bc 100644 --- a/src/components/VerticalTabBar/styles/VerticalTabBar.module.css +++ b/src/components/VerticalTabBar/styles/VerticalTabBar.module.css @@ -1,6 +1,6 @@ .container { - height: 100%; - border-right: 1px solid var(--colors-grey400); - margin-right: var(--spacers-dp24); + block-size: 100%; + border-inline-end: 1px solid var(--colors-grey400); + margin-inline-end: var(--spacers-dp24); background: var(--colors-white); } diff --git a/src/components/Visualization/styles/StartScreen.module.css b/src/components/Visualization/styles/StartScreen.module.css index 7b4f7331bc..180e63b2b1 100644 --- a/src/components/Visualization/styles/StartScreen.module.css +++ b/src/components/Visualization/styles/StartScreen.module.css @@ -1,12 +1,15 @@ .outer { display: flex; justify-content: center; - height: 100%; + block-size: 100%; flex-grow: 1; } .inner { - padding: var(--spacers-dp16) var(--spacers-dp24); - max-width: 600px; + padding-block-start: var(--spacers-dp16); + padding-block-end: var(--spacers-dp16); + padding-inline-start: var(--spacers-dp24); + padding-inline-end: var(--spacers-dp24); + max-inline-size: 600px; box-sizing: border-box; color: var(--colors-grey900); position: relative; @@ -20,9 +23,12 @@ text-align: center; } .errorIcon { - width: 136px; - height: 136px; - margin: 0 auto var(--spacers-dp24); + inline-size: 136px; + block-size: 136px; + margin-block-start: 0; + margin-block-end: var(--spacers-dp24); + margin-inline-start: auto; + margin-inline-end: auto; } .errorTitle { font-weight: 500; @@ -30,29 +36,35 @@ color: var(--colors-grey800); letter-spacing: 0.15px; line-height: 24px; - width: 360px; - margin: 0 auto var(--spacers-dp12); + inline-size: 360px; + margin-block-start: 0; + margin-block-end: var(--spacers-dp12); + margin-inline-start: auto; + margin-inline-end: auto; } .errorDescription { font-weight: 400; font-size: 14px; color: var(--colors-grey700); line-height: 19px; - width: 360px; - margin: 0 auto; + inline-size: 360px; + margin-block-start: 0; + margin-block-end: 0; + margin-inline-start: auto; + margin-inline-end: auto; } .title { font-weight: 500; font-size: 17px; - margin-top: 0; + margin-block-start: 0; line-height: 22px; color: var(--colors-grey800); } .section { - text-align: left; + text-align: start; background: var(--colors-white); padding: var(--spacers-dp16); - margin-bottom: var(--spacers-dp24); + margin-block-end: var(--spacers-dp24); border-radius: 5px; border: 1px solid var(--colors-grey400); } @@ -61,20 +73,32 @@ letter-spacing: 0.1px; list-style: circle; list-style-position: outside; - margin: 0 0 0 var(--spacers-dp12); - padding: 0 0 0 var(--spacers-dp12); + margin-block-start: 0; + margin-block-end: 0; + margin-inline-start: var(--spacers-dp12); + margin-inline-end: 0; + padding-block-start: 0; + padding-block-end: 0; + padding-inline-start: var(--spacers-dp12); + padding-inline-end: 0; } .guideItem { font-size: 14px; line-height: 18px; letter-spacing: 0.1px; - margin-bottom: var(--spacers-dp12); + margin-block-end: var(--spacers-dp12); } .visualization { display: flex; align-items: center; - margin: 0 0 var(--spacers-dp4) 0; - padding: var(--spacers-dp4) 0 var(--spacers-dp4) var(--spacers-dp12); + margin-block-start: 0; + margin-block-end: var(--spacers-dp4); + margin-inline-start: 0; + margin-inline-end: 0; + padding-block-start: var(--spacers-dp4); + padding-block-end: var(--spacers-dp4); + padding-inline-start: var(--spacers-dp12); + padding-inline-end: 0; letter-spacing: 0.1px; line-height: 16px; cursor: pointer; @@ -86,12 +110,12 @@ background-color: var(--colors-grey100); } .visIcon { - height: 16px; + block-size: 16px; display: flex; align-items: center; } .visIcon svg { - height: 16px; - width: 16px; - margin-right: var(--spacers-dp8); + block-size: 16px; + inline-size: 16px; + margin-inline-end: var(--spacers-dp8); } diff --git a/src/components/VisualizationOptions/styles/AxisRange.module.css b/src/components/VisualizationOptions/styles/AxisRange.module.css index 44627a0a1b..6dafa69c0d 100644 --- a/src/components/VisualizationOptions/styles/AxisRange.module.css +++ b/src/components/VisualizationOptions/styles/AxisRange.module.css @@ -1,3 +1,3 @@ .label { - margin-bottom: var(--spacers-dp4); + margin-block-end: var(--spacers-dp4); } diff --git a/src/components/VisualizationOptions/styles/Outliers.module.css b/src/components/VisualizationOptions/styles/Outliers.module.css index 26faf90446..4643cf46ff 100644 --- a/src/components/VisualizationOptions/styles/Outliers.module.css +++ b/src/components/VisualizationOptions/styles/Outliers.module.css @@ -1,4 +1,7 @@ .divider { - margin: var(--spacers-dp16) 22px; - border-bottom: 1px solid var(--colors-grey300); + margin-block-start: var(--spacers-dp16); + margin-block-end: var(--spacers-dp16); + margin-inline-start: 22px; + margin-inline-end: 22px; + border-block-end: 1px solid var(--colors-grey300); } diff --git a/src/components/VisualizationOptions/styles/SeriesTable.module.css b/src/components/VisualizationOptions/styles/SeriesTable.module.css index 107e1e3d10..4fc7ca1fa4 100644 --- a/src/components/VisualizationOptions/styles/SeriesTable.module.css +++ b/src/components/VisualizationOptions/styles/SeriesTable.module.css @@ -1,9 +1,9 @@ .nameColumn { - width: 45%; + inline-size: 45%; } .typeColumn { - width: 25%; + inline-size: 25%; } .tableHead { @@ -13,13 +13,13 @@ .tableHead .tableCell { padding: var(--spacers-dp8); line-height: normal; - height: auto; + block-size: auto; vertical-align: unset; } .tableBody .itemName { - padding-left: var(--spacers-dp8); - padding-right: var(--spacers-dp8); + padding-inline-start: var(--spacers-dp8); + padding-inline-end: var(--spacers-dp8); } .typeContainer { @@ -27,25 +27,25 @@ } .typeContainer:not(:last-child) { - margin-right: var(--spacers-dp16); + margin-inline-end: var(--spacers-dp16); } .visIcon { - height: 16px; + block-size: 16px; } .visIcon svg { - height: 16px; + block-size: 16px; } .axisIcon { display: flex; justify-content: center; - padding-top: var(--spacers-dp4); + padding-block-start: var(--spacers-dp4); } .errorContainer { - min-height: 450px; + min-block-size: 450px; justify-content: center; display: flex; flex-direction: column; @@ -54,9 +54,12 @@ } .errorIcon { - width: 136px; - height: 136px; - margin: 0 auto var(--spacers-dp24); + inline-size: 136px; + block-size: 136px; + margin-block-start: 0; + margin-block-end: var(--spacers-dp24); + margin-inline-start: auto; + margin-inline-end: auto; } .errorTitle { @@ -65,8 +68,11 @@ color: var(--colors-grey800); letter-spacing: 0.15px; line-height: 24px; - width: 360px; - margin: 0 auto var(--spacers-dp12); + inline-size: 360px; + margin-block-start: 0; + margin-block-end: var(--spacers-dp12); + margin-inline-start: auto; + margin-inline-end: auto; } .errorDescription { @@ -74,6 +80,9 @@ font-size: 14px; color: var(--colors-grey700); line-height: 19px; - width: 360px; - margin: 0 auto; + inline-size: 360px; + margin-block-start: 0; + margin-block-end: 0; + margin-inline-start: auto; + margin-inline-end: auto; } diff --git a/src/components/VisualizationOptions/styles/TextStyle.module.css b/src/components/VisualizationOptions/styles/TextStyle.module.css index a165cea53a..7261210662 100644 --- a/src/components/VisualizationOptions/styles/TextStyle.module.css +++ b/src/components/VisualizationOptions/styles/TextStyle.module.css @@ -6,28 +6,34 @@ .buttonStrip { display: flex; position: relative; - margin: var(--spacers-dp4) 0; + margin-block-start: var(--spacers-dp4); + margin-block-end: var(--spacers-dp4); + margin-inline-start: 0; + margin-inline-end: 0; } .container, .buttonStrip > *:not(:last-child) { - margin-right: var(--spacers-dp4); + margin-inline-end: var(--spacers-dp4); } .fontSizeSelect, .textAlignSelect { - min-width: 180px; - margin-right: var(--spacers-dp8); + min-inline-size: 180px; + margin-inline-end: var(--spacers-dp8); } .textColorLabel { - height: 28px; + block-size: 28px; font-size: 14px; line-height: 16px; border: 1px solid var(--colors-grey400); border-radius: 4px; cursor: pointer; - padding: 0 1px; + padding-block-start: 0; + padding-block-end: 0; + padding-inline-start: 1px; + padding-inline-end: 1px; } .textColorInput { @@ -37,7 +43,7 @@ } .textColorIcon { - margin-top: 1px; + margin-block-start: 1px; } .disabled { diff --git a/src/components/VisualizationOptions/styles/VisualizationOptions.style.js b/src/components/VisualizationOptions/styles/VisualizationOptions.style.js index bedbf42c60..04c13386f4 100644 --- a/src/components/VisualizationOptions/styles/VisualizationOptions.style.js +++ b/src/components/VisualizationOptions/styles/VisualizationOptions.style.js @@ -4,24 +4,27 @@ import css from 'styled-jsx/css' export const tabBar = css.resolve` div { - padding-right: ${spacers.dp24}; + padding-inline-end: ${spacers.dp24}; } ` export const tabContent = css.resolve` div { overflow: auto; - padding-right: ${spacers.dp24}; + padding-inline-end: ${spacers.dp24}; } ` export const tabSection = css.resolve` div { - padding: ${spacers.dp16} 0; + padding-block-start: ${spacers.dp16}; + padding-block-end: ${spacers.dp16}; + padding-inline-start: 0; + padding-inline-end: 0; } div:not(:last-child) { - border-bottom: 1px solid ${colors.grey300}; - margin-bottom: ${spacers.dp8}; + border-block-end: 1px solid ${colors.grey300}; + margin-block-end: ${spacers.dp8}; } ` @@ -34,7 +37,7 @@ export const tabSectionContent = css.resolve` export const tabSectionTitle = css.resolve` span { display: inline-block; - padding-bottom: ${spacers.dp12}; + padding-block-end: ${spacers.dp12}; font-size: 15px; color: ${colors.grey900}; font-weight: 500; @@ -50,26 +53,26 @@ export const tabSectionTitleDisabled = css.resolve` export const tabSectionTitleMargin = css.resolve` span { - margin-top: ${spacers.dp8}; + margin-block-start: ${spacers.dp8}; } ` export const tabSectionOption = css.resolve` div:not(:last-child):not(.inline) { - padding-bottom: ${spacers.dp16}; + padding-block-end: ${spacers.dp16}; } ` export const tabSectionOptionItem = css.resolve` div:not(:last-child) { - padding-bottom: ${spacers.dp8}; + padding-block-end: ${spacers.dp8}; } ` export const tabSectionOptionText = css.resolve` p { margin: 0; - padding-bottom: ${spacers.dp8}; + padding-block-end: ${spacers.dp8}; font-size: 14px; line-height: 19px; color: ${colors.grey700}; @@ -78,13 +81,16 @@ export const tabSectionOptionText = css.resolve` export const tabSectionOptionToggleable = css.resolve` div { - margin: ${spacers.dp4} 0 0 23px; + margin-block-start: ${spacers.dp4}; + margin-block-end: 0; + margin-inline-start: 23px; + margin-inline-end: 0; } ` export const tabSectionToggleableSubsection = css.resolve` div { - margin-left: 23px; + margin-inline-start: 23px; } ` @@ -97,7 +103,7 @@ export const tabSectionOptionComplexInline = css.resolve` export const tabSectionOptionIcon = css.resolve` span { vertical-align: top; - margin-right: ${spacers.dp4}; + margin-inline-end: ${spacers.dp4}; color: ${colors.grey600}; } ` diff --git a/src/components/VisualizationPlugin/styles/OutlierTablePlugin.module.css b/src/components/VisualizationPlugin/styles/OutlierTablePlugin.module.css index 539d0aac6f..46a6d19914 100644 --- a/src/components/VisualizationPlugin/styles/OutlierTablePlugin.module.css +++ b/src/components/VisualizationPlugin/styles/OutlierTablePlugin.module.css @@ -1,14 +1,14 @@ .pluginContainer { display: flex; gap: var(--spacers-dp4); - min-width: 0; - width: 100%; + min-inline-size: 0; + inline-size: 100%; margin: 0 var(--spacers-dp4) var(--spacers-dp4); } .visualizationContainer { display: flex; flex-direction: column; - max-width: 100%; + max-inline-size: 100%; } /* Table header cells in various sizes */ diff --git a/src/components/VisualizationPlugin/styles/PivotPlugin.style.js b/src/components/VisualizationPlugin/styles/PivotPlugin.style.js index db34a74c72..b818758130 100644 --- a/src/components/VisualizationPlugin/styles/PivotPlugin.style.js +++ b/src/components/VisualizationPlugin/styles/PivotPlugin.style.js @@ -22,13 +22,13 @@ export const pivotTableStyles = css.global` .pivot-value { background-color: #fff; - text-align: right; + text-align: end; } .pivot-value-total-subgrandtotal { background-color: #d8d8d8; white-space: nowrap; - text-align: right; + text-align: end; } .pointer { diff --git a/src/components/VisualizationPlugin/styles/VisualizationPlugin.module.css b/src/components/VisualizationPlugin/styles/VisualizationPlugin.module.css index 2172b39e06..99865389a4 100644 --- a/src/components/VisualizationPlugin/styles/VisualizationPlugin.module.css +++ b/src/components/VisualizationPlugin/styles/VisualizationPlugin.module.css @@ -1,11 +1,11 @@ .container { position: relative; - width: 100%; - height: 100%; + inline-size: 100%; + block-size: 100%; display: flex; } .modal { - max-height: calc(-285px + 100vh); + max-block-size: calc(-285px + 100vh); } .chartWrapper { @@ -14,21 +14,27 @@ } .legendKey { - margin: 0 8px; - width: 180px; + margin-block-start: 0; + margin-block-end: 0; + margin-inline-start: 8px; + margin-inline-end: 8px; + inline-size: 180px; } .legendKeyToggle { - margin: 1px 4px 0; + margin-block-start: 1px; + margin-block-end: 0; + margin-inline-start: 4px; + margin-inline-end: 4px; } .wrapper { position: absolute; - top: 0; - bottom: 0; + inset-block-start: 0; + inset-block-end: 0; overflow: auto; border: 1px solid var(--colors-grey400); } .buttonMargin { - margin-top: 34px; + margin-block-start: 34px; } @media print { @@ -36,6 +42,6 @@ display: none; } .buttonMargin { - margin-top: 0; + margin-block-start: 0; } } diff --git a/src/components/VisualizationTypeSelector/styles/VisualizationTypeSelector.module.css b/src/components/VisualizationTypeSelector/styles/VisualizationTypeSelector.module.css index 97b22b6655..230060463c 100644 --- a/src/components/VisualizationTypeSelector/styles/VisualizationTypeSelector.module.css +++ b/src/components/VisualizationTypeSelector/styles/VisualizationTypeSelector.module.css @@ -1,6 +1,6 @@ .arrowIcon { display: flex; - margin-left: auto; + margin-inline-start: auto; } .arrowIcon.listIsOpen { @@ -8,7 +8,10 @@ } .button { - padding: 7px var(--spacers-dp8); + padding-block-start: 7px; + padding-block-end: 7px; + padding-inline-start: var(--spacers-dp8); + padding-inline-end: var(--spacers-dp8); display: flex; align-items: center; justify-content: flex-start; @@ -24,22 +27,28 @@ .button > .selectedVizTypeLabel { font-size: 14px; - padding-top: 1px; + padding-block-start: 1px; user-select: none; color: var(--colors-grey900); - margin-left: 4px; + margin-inline-start: 4px; } .cardContainer { - margin: 1px 0; - min-height: 200px; + margin-block-start: 1px; + margin-block-end: 1px; + margin-inline-start: 0; + margin-inline-end: 0; + min-block-size: 200px; } .listContainer { - max-width: 888px; + max-inline-size: 888px; box-shadow: var(--elevations-e400); border-radius: 3px; - padding: 12px 16px; + padding-block-start: 12px; + padding-block-end: 12px; + padding-inline-start: 16px; + padding-inline-end: 16px; background: var(--colors-white); } @@ -49,23 +58,23 @@ } .listItem { - width: 280px; + inline-size: 280px; background: #fff; border: 1px solid var(--colors-grey300); border-radius: 3px; padding: var(--spacers-dp8); display: flex; align-items: flex-start; - margin-bottom: var(--spacers-dp8); + margin-block-end: var(--spacers-dp8); cursor: pointer; } .listItem:nth-child(3n + 1) { - margin-right: var(--spacers-dp8); + margin-inline-end: var(--spacers-dp8); } .listItem:nth-child(3n + 3) { - margin-left: var(--spacers-dp8); + margin-inline-start: var(--spacers-dp8); } .listItem:hover { @@ -89,20 +98,23 @@ } .listItemSvg { - width: var(--spacers-dp48); - height: var(--spacers-dp48); + inline-size: var(--spacers-dp48); + block-size: var(--spacers-dp48); } .listItemIcon { - width: 48px; - height: 48px; - margin-right: var(--spacers-dp8); + inline-size: 48px; + block-size: 48px; + margin-inline-end: var(--spacers-dp8); } .listItemName { font-size: 14px; font-weight: 500; - margin: 4px 0; + margin-block-start: 4px; + margin-block-end: 4px; + margin-inline-start: 0; + margin-inline-end: 0; } .listItemDescription { diff --git a/src/components/scrollbar.css b/src/components/scrollbar.css index 7cbf0f502a..7d2bd63195 100644 --- a/src/components/scrollbar.css +++ b/src/components/scrollbar.css @@ -1,11 +1,11 @@ /* Width */ ::-webkit-scrollbar { - width: 7px; - height: 7px; + inline-size: 7px; + block-size: 7px; } /* Handle */ ::-webkit-scrollbar-thumb { background: #d1d1d1; border-radius: 3px; -} \ No newline at end of file +} diff --git a/src/widgets/styles/LoadingMask.module.css b/src/widgets/styles/LoadingMask.module.css index 5d79816275..5f47081f68 100644 --- a/src/widgets/styles/LoadingMask.module.css +++ b/src/widgets/styles/LoadingMask.module.css @@ -1,6 +1,6 @@ .progress { margin: var(--spacers-dp12); - max-width: 200; + max-inline-size: 200; text-align: center; align-self: center; } @@ -8,5 +8,5 @@ .outer { display: flex; justify-content: center; - height: 100%; + block-size: 100%; } From 11be0f9811dc127c08c04b4800c3f837264ca1b0 Mon Sep 17 00:00:00 2001 From: Mozafar Haider Date: Fri, 9 Feb 2024 17:05:27 +0000 Subject: [PATCH 06/11] feat(DHIS2-16777): support right-to-left languages (manual css updates) --- .../IconButton/styles/IconButton.module.css | 9 ++- .../styles/DefaultAxis.module.css | 2 +- .../DefaultLayout/styles/DefaultAxis.style.js | 2 +- .../ScatterLayout/styles/ScatterAxis.style.js | 2 +- src/components/Layout/styles/Chip.module.css | 26 +++---- src/components/Layout/styles/Chip.style.js | 67 +++++++++++++++++++ src/components/Layout/styles/Tooltip.style.js | 2 +- .../TitleBar/styles/TitleBar.style.js | 2 +- .../styles/Visualization.style.js | 4 +- .../VisualizationOptions/Options/ColorSet.js | 2 +- 10 files changed, 94 insertions(+), 24 deletions(-) create mode 100644 src/components/Layout/styles/Chip.style.js diff --git a/src/components/IconButton/styles/IconButton.module.css b/src/components/IconButton/styles/IconButton.module.css index 413b863096..14440db8ab 100644 --- a/src/components/IconButton/styles/IconButton.module.css +++ b/src/components/IconButton/styles/IconButton.module.css @@ -10,9 +10,12 @@ padding: 0; vertical-align: middle; border-radius: 0; - width: 20px; - height: 20px; - margin: 0px 0px 0px 2px; + inline-size: 20px; + block-size: 20px; + margin-block-start: 0px; + margin-block-end: 0px; + margin-inline-start: 2px; + margin-inline-end: 0px; color: var(--colors-grey700); } diff --git a/src/components/Layout/DefaultLayout/styles/DefaultAxis.module.css b/src/components/Layout/DefaultLayout/styles/DefaultAxis.module.css index a93dc8f8c5..fff6bf53ff 100644 --- a/src/components/Layout/DefaultLayout/styles/DefaultAxis.module.css +++ b/src/components/Layout/DefaultLayout/styles/DefaultAxis.module.css @@ -4,7 +4,7 @@ align-items: flex-start; align-content: flex-start; flex-wrap: wrap; - min-height: 26px; + min-block-size: 26px; } .content > div { diff --git a/src/components/Layout/DefaultLayout/styles/DefaultAxis.style.js b/src/components/Layout/DefaultLayout/styles/DefaultAxis.style.js index a3c55e8e86..73b8dce7ae 100644 --- a/src/components/Layout/DefaultLayout/styles/DefaultAxis.style.js +++ b/src/components/Layout/DefaultLayout/styles/DefaultAxis.style.js @@ -11,7 +11,7 @@ export default { padding: layoutStyle.AXIS_PADDING, }, axisContainerLeft: { - borderLeftWidth: 0, + borderInlineStartWidth: 0, }, label: { minWidth: 55, diff --git a/src/components/Layout/ScatterLayout/styles/ScatterAxis.style.js b/src/components/Layout/ScatterLayout/styles/ScatterAxis.style.js index 27d7cb3ca1..75f705d075 100644 --- a/src/components/Layout/ScatterLayout/styles/ScatterAxis.style.js +++ b/src/components/Layout/ScatterLayout/styles/ScatterAxis.style.js @@ -12,7 +12,7 @@ export default { padding: layoutStyle.AXIS_PADDING, }, axisContainerLeft: { - borderLeftWidth: 0, + borderInlineStartWidth: 0, }, label: { minWidth: 55, diff --git a/src/components/Layout/styles/Chip.module.css b/src/components/Layout/styles/Chip.module.css index 822d94dc10..9f79bd3097 100644 --- a/src/components/Layout/styles/Chip.module.css +++ b/src/components/Layout/styles/Chip.module.css @@ -1,5 +1,5 @@ .chip { - max-width: 400px; + max-inline-size: 400px; display: flex; align-items: center; background-color: var(--colors-teal100); @@ -46,15 +46,15 @@ } .warningIconWrapper { - padding-left: 2px; - height: 20px; + padding-inline-start: 2px; + block-size: 20px; display: flex; align-items: center; } .lockIconWrapper { background: #cbe7e5; - height: 20px; + block-size: 20px; padding: 0 2px 0 3px; margin: 0 0 0 2px; display: flex; @@ -85,19 +85,19 @@ overflow: hidden; text-overflow: ellipsis; display: flex; - border-top-right-radius: 0px; - border-bottom-right-radius: 0px; + border-start-end-radius: 0px; + border-end-end-radius: 0px; align-items: center; - min-height: 20px; + min-block-size: 20px; margin: 0 2px 0 0; } .chipRight { - padding-left: 0px; - border-top-left-radius: 0px; - border-bottom-left-radius: 0px; + padding-inline-start: 0px; + border-start-start-radius: 0px; + border-end-start-radius: 0px; display: flex; - height: 20px; + block-size: 20px; } .chipRight + .lockIconWrapper { @@ -109,8 +109,8 @@ font-size: 11px; background: #c5e4e3; border-radius: 2px; - margin-left: 4px; - min-width: 12px; + margin-inline-start: 4px; + min-inline-size: 12px; text-align: center; padding: 2px 2px 1px 2px; overflow: hidden; diff --git a/src/components/Layout/styles/Chip.style.js b/src/components/Layout/styles/Chip.style.js new file mode 100644 index 0000000000..c97a72f833 --- /dev/null +++ b/src/components/Layout/styles/Chip.style.js @@ -0,0 +1,67 @@ +import { colors } from '@dhis2/ui' +import * as layoutStyle from './style.js' + +const baseChip = { + padding: layoutStyle.CHIP_PADDING, + fontSize: layoutStyle.CHIP_FONT_SIZE, + fontWeight: layoutStyle.CHIP_FONT_WEIGHT, + color: layoutStyle.CHIP_COLOR, + cursor: 'pointer', + minHeight: 24, + userSelect: 'none', +} + +export const styles = { + chipWrapper: { + display: 'flex', + margin: layoutStyle.CHIP_MARGIN, + backgroundColor: layoutStyle.CHIP_BACKGROUND_COLOR, + borderRadius: layoutStyle.CHIP_BORDER_RADIUS, + alignItems: 'center', + maxWidth: '400px', + }, + chip: { + ...baseChip, + whiteSpace: 'nowrap', + overflow: 'hidden', + textOverflow: 'ellipsis', + }, + chipEmpty: { + backgroundColor: colors.grey300, + }, + fixedDimensionIcon: { + paddingRight: '6px', + }, + leftIconWrapper: { + paddingRight: '6px', + display: 'flex', + alignItems: 'center', + }, + rightIconWrapper: { + paddingInlineStart: '6px', + marginBlockStart: '2px', + }, + label: { + whiteSpace: 'nowrap', + overflow: 'hidden', + textOverflow: 'ellipsis', + }, +} + +styles.chipLeft = { + ...baseChip, + whiteSpace: 'nowrap', + overflow: 'hidden', + textOverflow: 'ellipsis', + display: 'flex', + borderTopRightRadius: '0px', + borderBottomRightRadius: '0px', + alignItems: 'center', +} + +styles.chipRight = { + ...baseChip, + paddingInlineStart: '0px', + borderStartStartRadius: '0px', + borderEndStartRadius: '0px', +} diff --git a/src/components/Layout/styles/Tooltip.style.js b/src/components/Layout/styles/Tooltip.style.js index 0118849244..862c954d99 100644 --- a/src/components/Layout/styles/Tooltip.style.js +++ b/src/components/Layout/styles/Tooltip.style.js @@ -32,6 +32,6 @@ export const styles = { }, label: { whiteSpace: 'normal', - marginLeft: '6px', + marginInlineStart: '6px', }, } diff --git a/src/components/TitleBar/styles/TitleBar.style.js b/src/components/TitleBar/styles/TitleBar.style.js index 8fb6d4c2df..a6fe0af69e 100644 --- a/src/components/TitleBar/styles/TitleBar.style.js +++ b/src/components/TitleBar/styles/TitleBar.style.js @@ -17,7 +17,7 @@ export default { fontSize: '14px', }, suffix: { - paddingLeft: '4px', + paddingInlineStart: '4px', }, titleUnsaved: { color: colors.grey500, diff --git a/src/components/Visualization/styles/Visualization.style.js b/src/components/Visualization/styles/Visualization.style.js index 242ee71dd8..9ab33089c3 100644 --- a/src/components/Visualization/styles/Visualization.style.js +++ b/src/components/Visualization/styles/Visualization.style.js @@ -9,8 +9,8 @@ export default { position: 'absolute', height: '100%', width: '100%', - left: 0, - top: 0, + insetInlineStart: 0, + insetBlockStart: 0, zIndex: 100, background: '#ffffffab', }, diff --git a/src/components/VisualizationOptions/Options/ColorSet.js b/src/components/VisualizationOptions/Options/ColorSet.js index 12619de73b..7dd2529cf5 100644 --- a/src/components/VisualizationOptions/Options/ColorSet.js +++ b/src/components/VisualizationOptions/Options/ColorSet.js @@ -90,7 +90,7 @@ ColorSet.propTypes = { const ColorSetPreview = ({ colorSet, disabled }) => (
{colorSet?.patterns && colorSet.patterns.map((pattern, index) => ( From 5b21df63d3335d1d1e45118d0ad0c1b101db8ae1 Mon Sep 17 00:00:00 2001 From: Mozafar Haider Date: Fri, 9 Feb 2024 17:05:49 +0000 Subject: [PATCH 07/11] chore: update d2 config to allow right-to-left support --- d2.config.js | 2 + package.json | 2 +- yarn.lock | 143 +++++++++++++++++++++++++++++++++++---------------- 3 files changed, 101 insertions(+), 46 deletions(-) diff --git a/d2.config.js b/d2.config.js index 1f003e36b3..f256c28edc 100644 --- a/d2.config.js +++ b/d2.config.js @@ -7,6 +7,8 @@ const config = { minDHIS2Version: '2.40', + direction: 'auto', + pwa: { enabled: true, caching: { diff --git a/package.json b/package.json index 925b97c42e..fc4ca4b6f8 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "cy:run": "start-server-and-test 'yarn start:nobrowser' http://localhost:3000 'yarn cypress run --browser chrome headless --env networkMode=live'" }, "devDependencies": { - "@dhis2/cli-app-scripts": "^10.3.9", + "@dhis2/cli-app-scripts": "10.5.0-alpha.2", "@dhis2/cli-style": "^10.5.1", "@dhis2/cypress-commands": "^10.0.3", "@dhis2/cypress-plugins": "^10.0.2", diff --git a/yarn.lock b/yarn.lock index 1988f07db2..2d146522b0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2050,12 +2050,12 @@ react-beautiful-dnd "^10.1.1" resize-observer-polyfill "^1.5.1" -"@dhis2/app-adapter@10.3.9": - version "10.3.9" - resolved "https://registry.yarnpkg.com/@dhis2/app-adapter/-/app-adapter-10.3.9.tgz#f0733e72bff86661889c6fcf3a8e0ca3452f3121" - integrity sha512-T/FFxzInvNw4YKZX+SuWpge0UGqzKX5w1rC3gBK38sFFpnBGNHgV5QMKo/DZeLDceDu1yrZbkluANoEujJSv9Q== +"@dhis2/app-adapter@10.5.0-alpha.2": + version "10.5.0-alpha.2" + resolved "https://registry.yarnpkg.com/@dhis2/app-adapter/-/app-adapter-10.5.0-alpha.2.tgz#6414b360c88597d1037bf2623b68af2733a4c4c3" + integrity sha512-JOffkgVt3U/Sltpnc2RSa3637hd7Dosc1fQNC1gZesSBAXyA+//oT1trPPYvGV1u8EWaDx7rY+/PBsvGTEQg/Q== dependencies: - "@dhis2/pwa" "10.3.9" + "@dhis2/pwa" "10.5.0-alpha.2" moment "^2.24.0" "@dhis2/app-runtime-adapter-d2@^1.1.0": @@ -2065,30 +2065,31 @@ dependencies: prop-types "^15.7.2" -"@dhis2/app-runtime@^3.7.0", "@dhis2/app-runtime@^3.9.0": - version "3.9.0" - resolved "https://registry.yarnpkg.com/@dhis2/app-runtime/-/app-runtime-3.9.0.tgz#c7e295fd0a68fac976a930bc77105206ded0b61a" - integrity sha512-n0S4pbyvK7FnBQFMONGrhR9YYavBQI+mQLHfCX/vtvOyeoioBUNIinuQlGysuLMEkSVaK5OjV40rvTMzdxF2kQ== +"@dhis2/app-runtime@^3.10.0-alpha.2", "@dhis2/app-runtime@^3.10.2": + version "3.10.2" + resolved "https://registry.yarnpkg.com/@dhis2/app-runtime/-/app-runtime-3.10.2.tgz#e82639bd68234bdeaf2f6d3c256dcdfcdd267da2" + integrity sha512-GiftKk8ZTXlPElXAgVJn41Vj6E1vEGTPGrjrqU7j41ZTYsg+tUcCkISNt1woe5l7E+8+y+9Fy4bgqSsBOAEUvg== dependencies: - "@dhis2/app-service-alerts" "3.9.0" - "@dhis2/app-service-config" "3.9.0" - "@dhis2/app-service-data" "3.9.0" - "@dhis2/app-service-offline" "3.9.0" + "@dhis2/app-service-alerts" "3.10.2" + "@dhis2/app-service-config" "3.10.2" + "@dhis2/app-service-data" "3.10.2" + "@dhis2/app-service-offline" "3.10.2" + "@dhis2/app-service-plugin" "3.10.2" -"@dhis2/app-service-alerts@3.9.0": - version "3.9.0" - resolved "https://registry.yarnpkg.com/@dhis2/app-service-alerts/-/app-service-alerts-3.9.0.tgz#48d3805676e75ee58104fea4f76cfa779335444e" - integrity sha512-z2eZxm/pxrmFbisbK7/qJKtif2CNWJjaaAH5rfrs5OIajlHy3rO37vSaTQHWv+xWvZFQrs2Op2InxzG0qh5ncA== +"@dhis2/app-service-alerts@3.10.2": + version "3.10.2" + resolved "https://registry.yarnpkg.com/@dhis2/app-service-alerts/-/app-service-alerts-3.10.2.tgz#0e07c3530606f81ab998a20f2c478600b6027a77" + integrity sha512-2IqaawnlOzYVJLBF2AKVQJ4cuxJNZD7FK0XE0XOv1WwFs70h6bp23MQueIJ/QHxLo7lamE0FC22m4diM4P0CuA== -"@dhis2/app-service-config@3.9.0": - version "3.9.0" - resolved "https://registry.yarnpkg.com/@dhis2/app-service-config/-/app-service-config-3.9.0.tgz#8dc59d8de246f54057c0c685d5f94b4cbade6f73" - integrity sha512-OuRn2mJGrQQ8QIC+oIVYYpclB4LErRK2wtsuy/cXLfRbeUti1qWIh110rgd1hnTx+BgRCs5s3NWdIQxS4hYGIQ== +"@dhis2/app-service-config@3.10.2": + version "3.10.2" + resolved "https://registry.yarnpkg.com/@dhis2/app-service-config/-/app-service-config-3.10.2.tgz#be52676068e31cdb1fe3f8ddabb8153e1cd6e3e6" + integrity sha512-Crw7Tx4yg4qWw3qYxNCIye77IaY2HUYyDmDKPVVWzgmrcSGxpunv/NtsUg12pxrVfVLnqlH9L6AF9A6hO0afmw== -"@dhis2/app-service-data@3.9.0": - version "3.9.0" - resolved "https://registry.yarnpkg.com/@dhis2/app-service-data/-/app-service-data-3.9.0.tgz#37f528b5f7f589cbab8dcc7f997c1668bc6566a9" - integrity sha512-/FJgJhL6YGtIVNX5oaNmavkGmimrVHQsS8ueeUO4FvTjYXGlnnN3IuxypQcy/x4yiUyigbPgFJRnbC1J2af2fg== +"@dhis2/app-service-data@3.10.2": + version "3.10.2" + resolved "https://registry.yarnpkg.com/@dhis2/app-service-data/-/app-service-data-3.10.2.tgz#e94d45d87cab5e156decfe9e92e3153e5df68ba0" + integrity sha512-+ESLrVEDQKXBaQmpaCq78RonkqJM2BliykaO4QBeOc4ilWohaqYajue1Ntg4uV2KrdkCylBdMDwGYjsak0G7hg== dependencies: react-query "^3.13.11" @@ -2105,25 +2106,33 @@ "@dhis2/app-service-data" "^2.1.1" uuid "^8.1.0" -"@dhis2/app-service-offline@3.9.0": - version "3.9.0" - resolved "https://registry.yarnpkg.com/@dhis2/app-service-offline/-/app-service-offline-3.9.0.tgz#fe4f4a91a1da77554965f6a5fe6f6951d4c467f4" - integrity sha512-0q5zl0vw+a47Ab2qgu6hsZY5ybnH/ea43Vkk4aXYdgcf57xB8ck9DkIcNbc2e1+k9FhvimipxsgTZSbEA/8hJA== +"@dhis2/app-service-offline@3.10.2": + version "3.10.2" + resolved "https://registry.yarnpkg.com/@dhis2/app-service-offline/-/app-service-offline-3.10.2.tgz#082279b7045e702c2eecda751d762225313156b0" + integrity sha512-bTp+CCRbyKt/0QADj0O6wLNWhi+6QDkjt2+sfpv3M8oKcftjaQDqedVoypZRA0nqvSdVL2ehtTzqMrrxu6jtZQ== dependencies: lodash "^4.17.21" -"@dhis2/app-shell@10.3.9": - version "10.3.9" - resolved "https://registry.yarnpkg.com/@dhis2/app-shell/-/app-shell-10.3.9.tgz#4def65cfa436047de896865b107d496afbafc643" - integrity sha512-GkKGz1FIcXL4XG7cMPob0T78EvI8ML3CJbtVDxMDx++20R8vD+gKB4jbdXA5QooWeojDA5kpPmNiVHNUJb6LUw== +"@dhis2/app-service-plugin@3.10.2": + version "3.10.2" + resolved "https://registry.yarnpkg.com/@dhis2/app-service-plugin/-/app-service-plugin-3.10.2.tgz#09de64ee59017c86c8dab96a0d2ca0d915ae9d31" + integrity sha512-FqR6ILmvAXT2n1SzCZknT+5jJRdajg1dBegWAu3xqZXAntsM4wvFLCx6EtjS5LO2Kga9VZ+TJmVr2UFX1330CQ== dependencies: - "@dhis2/app-adapter" "10.3.9" - "@dhis2/app-runtime" "^3.9.0" + post-robot "^10.0.46" + +"@dhis2/app-shell@10.5.0-alpha.2": + version "10.5.0-alpha.2" + resolved "https://registry.yarnpkg.com/@dhis2/app-shell/-/app-shell-10.5.0-alpha.2.tgz#3e082cc65ae5e3652502ac54ef2557c9bf99653b" + integrity sha512-9Ar9qpYaNM/L41P97BtaDemMP/8d7VL9lEhXCLli9YPw4fYfTSl2oZu7R4/NvdHWKI7odvogfab4U9Izbjg9wQ== + dependencies: + "@dhis2/app-adapter" "10.5.0-alpha.2" + "@dhis2/app-runtime" "^3.10.0-alpha.2" "@dhis2/d2-i18n" "^1.1.1" - "@dhis2/pwa" "10.3.9" + "@dhis2/pwa" "10.5.0-alpha.2" "@dhis2/ui" "^8.12.3" classnames "^2.2.6" moment "^2.29.1" + post-robot "^10.0.46" prop-types "^15.7.2" react "^16.8.6" react-dom "^16.8.6" @@ -2133,10 +2142,10 @@ typeface-roboto "^0.0.75" typescript "^3.6.3" -"@dhis2/cli-app-scripts@^10.3.9": - version "10.3.9" - resolved "https://registry.yarnpkg.com/@dhis2/cli-app-scripts/-/cli-app-scripts-10.3.9.tgz#8a971b52c08f165bcee78fb5bddfd0891ae7f7c2" - integrity sha512-toltKttbok1ORBYvXYOtaIyUUs5C7lB3SEbZuk4KnibwmtG3v/37UEgXC6y0nc0L3XDBz/HK/LrbU4/7osfvcA== +"@dhis2/cli-app-scripts@10.5.0-alpha.2": + version "10.5.0-alpha.2" + resolved "https://registry.yarnpkg.com/@dhis2/cli-app-scripts/-/cli-app-scripts-10.5.0-alpha.2.tgz#9481a4c3bb8d023bcee0e8c1796f8a30f9906c58" + integrity sha512-ez8D16+P2Sy5DLnSC7LvqqXH0nVe2VnjLn3mNQIYJb5NjRyNng4GXbpA6dbdFsXBaRfKYKzaQ5ArC5t2gPfUjw== dependencies: "@babel/core" "^7.6.2" "@babel/plugin-proposal-class-properties" "^7.8.3" @@ -2145,7 +2154,7 @@ "@babel/preset-env" "^7.14.7" "@babel/preset-react" "^7.0.0" "@babel/preset-typescript" "^7.6.0" - "@dhis2/app-shell" "10.3.9" + "@dhis2/app-shell" "10.5.0-alpha.2" "@dhis2/cli-helpers-engine" "^3.2.0" "@jest/core" "^27.0.6" "@pmmmwh/react-refresh-webpack-plugin" "^0.5.4" @@ -2276,10 +2285,10 @@ resolved "https://registry.yarnpkg.com/@dhis2/prop-types/-/prop-types-3.1.2.tgz#65b8ad2da8cd2f72bc8b951049a6c9d1b97af3e9" integrity sha512-eM0jjLOWvtXWqSFp5YC4DHFpkP8Y1D2eUwGV7MBWjni+o27oesVan+oT7WHeOeLdlAd4acRJrnaaAyB4Ck1wGQ== -"@dhis2/pwa@10.3.9": - version "10.3.9" - resolved "https://registry.yarnpkg.com/@dhis2/pwa/-/pwa-10.3.9.tgz#c119b7da18218a4ea3d18c7eb01c2aca5fc619a2" - integrity sha512-yYxOjgi1D0S6Ah5xQwZauQ3zhXuiojc9AMkP+J+bpZYQhj4hzB2dKyJ252dClO6P/7EtoSj9XJOsMx007uIUEQ== +"@dhis2/pwa@10.5.0-alpha.2": + version "10.5.0-alpha.2" + resolved "https://registry.yarnpkg.com/@dhis2/pwa/-/pwa-10.5.0-alpha.2.tgz#dff4f379832c3e857d73a58761c2b8387ea4a418" + integrity sha512-WWOzJukZjoX2TZiz8STj7miCMytWm4uj/jytVv4R912ilcpdW3g7I2H0ta7QN7hhIxidIirj2vDx1TFt1effOQ== dependencies: idb "^6.0.0" workbox-core "^6.1.5" @@ -4699,6 +4708,15 @@ bcrypt-pbkdf@^1.0.0: dependencies: tweetnacl "^0.14.3" +belter@^1.0.41: + version "1.0.190" + resolved "https://registry.yarnpkg.com/belter/-/belter-1.0.190.tgz#491857550ef240d9c66b56fc637991f5c3089966" + integrity sha512-jz05FHrO+bwitdI6JxV5ESyRdVhTcwMWQ7L4o+q/R4LNJFQrG58sp9EiwsSjhbihhiyYFcmmCMRRagxte6igtw== + dependencies: + cross-domain-safe-weakmap "^1" + cross-domain-utils "^2" + zalgo-promise "^1" + bfj@^7.0.2: version "7.0.2" resolved "https://registry.yarnpkg.com/bfj/-/bfj-7.0.2.tgz#1988ce76f3add9ac2913fd8ba47aad9e651bfbb2" @@ -5915,6 +5933,20 @@ create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7: safe-buffer "^5.0.1" sha.js "^2.4.8" +cross-domain-safe-weakmap@^1, cross-domain-safe-weakmap@^1.0.1: + version "1.0.29" + resolved "https://registry.yarnpkg.com/cross-domain-safe-weakmap/-/cross-domain-safe-weakmap-1.0.29.tgz#0847975c27d9e1cc840f24c1745311958df98022" + integrity sha512-VLoUgf2SXnf3+na8NfeUFV59TRZkIJqCIATaMdbhccgtnTlSnHXkyTRwokngEGYdQXx8JbHT9GDYitgR2sdjuA== + dependencies: + cross-domain-utils "^2.0.0" + +cross-domain-utils@^2, cross-domain-utils@^2.0.0: + version "2.0.38" + resolved "https://registry.yarnpkg.com/cross-domain-utils/-/cross-domain-utils-2.0.38.tgz#2eaf321c4dfdb61596805ca4233fde4400cb6377" + integrity sha512-zZfi3+2EIR9l4chrEiXI2xFleyacsJf8YMLR1eJ0Veb5FTMXeJ3DpxDjZkto2FhL/g717WSELqbptNSo85UJDw== + dependencies: + zalgo-promise "^1.0.11" + cross-spawn@^5.0.1: version "5.1.0" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" @@ -12201,6 +12233,17 @@ posix-character-classes@^0.1.0: resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs= +post-robot@^10.0.46: + version "10.0.46" + resolved "https://registry.yarnpkg.com/post-robot/-/post-robot-10.0.46.tgz#39cea5b51033729390fc7c90be3285cd285f0377" + integrity sha512-EgVJiuvI4iRWDZvzObWes0X/n8olWBEJWxlSw79zmhpgkigX8UsVL4VOBhVtoJKwf0Y9qP9g2zOONw1rv80QbA== + dependencies: + belter "^1.0.41" + cross-domain-safe-weakmap "^1.0.1" + cross-domain-utils "^2.0.0" + universal-serialize "^1.0.4" + zalgo-promise "^1.0.3" + postcss-attribute-case-insensitive@^5.0.2: version "5.0.2" resolved "https://registry.yarnpkg.com/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.2.tgz#03d761b24afc04c09e757e92ff53716ae8ea2741" @@ -15496,6 +15539,11 @@ unique-string@^2.0.0: dependencies: crypto-random-string "^2.0.0" +universal-serialize@^1.0.4: + version "1.0.10" + resolved "https://registry.yarnpkg.com/universal-serialize/-/universal-serialize-1.0.10.tgz#3279bb30f47290ea479f45135620f98fa9d3f3a6" + integrity sha512-FdouA4xSFa0fudk1+z5vLWtxZCoC0Q9lKYV3uUdFl7DttNfolmiw2ASr5ddY+/Yz6Isr68u3IqC9XMSwMP+Pow== + universalify@^0.1.0: version "0.1.2" resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" @@ -16479,6 +16527,11 @@ yocto-queue@^0.1.0: resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== +zalgo-promise@^1, zalgo-promise@^1.0.11, zalgo-promise@^1.0.3: + version "1.0.48" + resolved "https://registry.yarnpkg.com/zalgo-promise/-/zalgo-promise-1.0.48.tgz#9e33eef502d5ed9f5a09fc5728c833c3e87afa2e" + integrity sha512-LLHANmdm53+MucY9aOFIggzYtUdkSBFxUsy4glTTQYNyK6B3uCPWTbfiGvSrEvLojw0mSzyFJ1/RRLv+QMNdzQ== + zip-stream@^2.1.2: version "2.1.3" resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-2.1.3.tgz#26cc4bdb93641a8590dd07112e1f77af1758865b" From c16e61d3bb6ce3cbca5f18ceae4e4a7845c412b2 Mon Sep 17 00:00:00 2001 From: Mozafar Haider Date: Thu, 30 May 2024 16:53:32 +0100 Subject: [PATCH 08/11] chore: add stylelint config --- .stylelintrc.js | 13 + package.json | 8 +- src/components/Layout/styles/Chip.style.js | 67 --- .../VisualizationOptions/Options/ColorSet.js | 6 +- yarn.lock | 478 +++++++++++++----- 5 files changed, 374 insertions(+), 198 deletions(-) create mode 100644 .stylelintrc.js delete mode 100644 src/components/Layout/styles/Chip.style.js diff --git a/.stylelintrc.js b/.stylelintrc.js new file mode 100644 index 0000000000..913c9635ee --- /dev/null +++ b/.stylelintrc.js @@ -0,0 +1,13 @@ +const { config } = require('@dhis2/cli-style') + +module.exports = { + extends: [config.stylelint], + rules: { + 'csstools/use-logical': [ + true, + { + severity: 'error', + }, + ], + }, +} diff --git a/package.json b/package.json index fc4ca4b6f8..4a2ed8c9c3 100644 --- a/package.json +++ b/package.json @@ -20,8 +20,8 @@ "cy:run": "start-server-and-test 'yarn start:nobrowser' http://localhost:3000 'yarn cypress run --browser chrome headless --env networkMode=live'" }, "devDependencies": { - "@dhis2/cli-app-scripts": "10.5.0-alpha.2", - "@dhis2/cli-style": "^10.5.1", + "@dhis2/cli-app-scripts": "^11.3.0", + "@dhis2/cli-style": "^10.7.3", "@dhis2/cypress-commands": "^10.0.3", "@dhis2/cypress-plugins": "^10.0.2", "@reportportal/agent-js-cypress": "git+https://github.com/dhis2/agent-js-cypress.git#develop", @@ -41,7 +41,7 @@ }, "dependencies": { "@dhis2/analytics": "^26.6.10", - "@dhis2/app-runtime": "^3.7.0", + "@dhis2/app-runtime": "^3.10.4", "@dhis2/app-runtime-adapter-d2": "^1.1.0", "@dhis2/app-service-datastore": "^1.0.0-beta.3", "@dhis2/d2-i18n": "^1.1.0", @@ -67,6 +67,6 @@ "whatwg-fetch": "^3.6.2" }, "resolutions": { - "@dhis2/ui": "^9.2.0" + "@dhis2/ui": "^9.4.4" } } diff --git a/src/components/Layout/styles/Chip.style.js b/src/components/Layout/styles/Chip.style.js deleted file mode 100644 index c97a72f833..0000000000 --- a/src/components/Layout/styles/Chip.style.js +++ /dev/null @@ -1,67 +0,0 @@ -import { colors } from '@dhis2/ui' -import * as layoutStyle from './style.js' - -const baseChip = { - padding: layoutStyle.CHIP_PADDING, - fontSize: layoutStyle.CHIP_FONT_SIZE, - fontWeight: layoutStyle.CHIP_FONT_WEIGHT, - color: layoutStyle.CHIP_COLOR, - cursor: 'pointer', - minHeight: 24, - userSelect: 'none', -} - -export const styles = { - chipWrapper: { - display: 'flex', - margin: layoutStyle.CHIP_MARGIN, - backgroundColor: layoutStyle.CHIP_BACKGROUND_COLOR, - borderRadius: layoutStyle.CHIP_BORDER_RADIUS, - alignItems: 'center', - maxWidth: '400px', - }, - chip: { - ...baseChip, - whiteSpace: 'nowrap', - overflow: 'hidden', - textOverflow: 'ellipsis', - }, - chipEmpty: { - backgroundColor: colors.grey300, - }, - fixedDimensionIcon: { - paddingRight: '6px', - }, - leftIconWrapper: { - paddingRight: '6px', - display: 'flex', - alignItems: 'center', - }, - rightIconWrapper: { - paddingInlineStart: '6px', - marginBlockStart: '2px', - }, - label: { - whiteSpace: 'nowrap', - overflow: 'hidden', - textOverflow: 'ellipsis', - }, -} - -styles.chipLeft = { - ...baseChip, - whiteSpace: 'nowrap', - overflow: 'hidden', - textOverflow: 'ellipsis', - display: 'flex', - borderTopRightRadius: '0px', - borderBottomRightRadius: '0px', - alignItems: 'center', -} - -styles.chipRight = { - ...baseChip, - paddingInlineStart: '0px', - borderStartStartRadius: '0px', - borderEndStartRadius: '0px', -} diff --git a/src/components/VisualizationOptions/Options/ColorSet.js b/src/components/VisualizationOptions/Options/ColorSet.js index 7dd2529cf5..112fa362f5 100644 --- a/src/components/VisualizationOptions/Options/ColorSet.js +++ b/src/components/VisualizationOptions/Options/ColorSet.js @@ -90,7 +90,11 @@ ColorSet.propTypes = { const ColorSetPreview = ({ colorSet, disabled }) => (
{colorSet?.patterns && colorSet.patterns.map((pattern, index) => ( diff --git a/yarn.lock b/yarn.lock index 2d146522b0..191c02fa28 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1281,6 +1281,21 @@ dependencies: chalk "^4.0.0" +"@csstools/css-parser-algorithms@^2.6.3": + version "2.6.3" + resolved "https://registry.yarnpkg.com/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.6.3.tgz#b5e7eb2bd2a42e968ef61484f1490a8a4148a8eb" + integrity sha512-xI/tL2zxzEbESvnSxwFgwvy5HS00oCXxL4MLs6HUiDcYfwowsoQaABKxUElp1ARITrINzBnsECOc1q0eg2GOrA== + +"@csstools/css-tokenizer@^2.3.1": + version "2.3.1" + resolved "https://registry.yarnpkg.com/@csstools/css-tokenizer/-/css-tokenizer-2.3.1.tgz#3d47e101ad48d815a4bdce8159fb5764f087f17a" + integrity sha512-iMNHTyxLbBlWIfGtabT157LH9DUx9X8+Y3oymFEuMj8HNc+rpE3dPFGFgHjpKfjeFDjLjYIAIhXPGvS2lKxL9g== + +"@csstools/media-query-list-parser@^2.1.11": + version "2.1.11" + resolved "https://registry.yarnpkg.com/@csstools/media-query-list-parser/-/media-query-list-parser-2.1.11.tgz#465aa42f268599729350e305e1ae14a30c1daf51" + integrity sha512-uox5MVhvNHqitPP+SynrB1o8oPxPMt2JLgp5ghJOWf54WGQ5OKu47efne49r1SWqs3wRP8xSWjnO9MBKxhB1dA== + "@csstools/normalize.css@*": version "12.0.0" resolved "https://registry.yarnpkg.com/@csstools/normalize.css/-/normalize.css-12.0.0.tgz#a9583a75c3f150667771f30b60d9f059473e62c4" @@ -1392,6 +1407,11 @@ resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-2.0.2.tgz#1bfafe4b7ed0f3e4105837e056e0a89b108ebe36" integrity sha512-IkpVW/ehM1hWKln4fCA3NzJU8KwD+kIOvPZA4cqxoJHtE21CCzjyp+Kxbu0i5I4tBNOlXPL9mjwnWlL0VEG4Fg== +"@csstools/selector-specificity@^3.1.1": + version "3.1.1" + resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-3.1.1.tgz#63085d2995ca0f0e55aa8b8a07d69bfd48b844fe" + integrity sha512-a7cxGcJ2wIlMFLlh8z2ONm+715QkPHiyJcxwQlKOz/03GPw1COpfhcmC9wm4xlZfp//jWHNNMwzjtqHXVWU9KA== + "@cypress/browserify-preprocessor@^3.0.1": version "3.0.2" resolved "https://registry.yarnpkg.com/@cypress/browserify-preprocessor/-/browserify-preprocessor-3.0.2.tgz#1dbecae394937aed47a3524cad47086c2ded8c50" @@ -2050,12 +2070,12 @@ react-beautiful-dnd "^10.1.1" resize-observer-polyfill "^1.5.1" -"@dhis2/app-adapter@10.5.0-alpha.2": - version "10.5.0-alpha.2" - resolved "https://registry.yarnpkg.com/@dhis2/app-adapter/-/app-adapter-10.5.0-alpha.2.tgz#6414b360c88597d1037bf2623b68af2733a4c4c3" - integrity sha512-JOffkgVt3U/Sltpnc2RSa3637hd7Dosc1fQNC1gZesSBAXyA+//oT1trPPYvGV1u8EWaDx7rY+/PBsvGTEQg/Q== +"@dhis2/app-adapter@11.3.0": + version "11.3.0" + resolved "https://registry.yarnpkg.com/@dhis2/app-adapter/-/app-adapter-11.3.0.tgz#7c346993e2f024591a91e9ce29ace294cf4dda88" + integrity sha512-/inaO6jWZ5UQpytTd8MDuBt5lExBVJEn51hLNy4Lcwv66QIMnFu/Y80W7H2sFIxBkjG7IGx1769q4iLWIZ2N9Q== dependencies: - "@dhis2/pwa" "10.5.0-alpha.2" + "@dhis2/pwa" "11.3.0" moment "^2.24.0" "@dhis2/app-runtime-adapter-d2@^1.1.0": @@ -2065,31 +2085,31 @@ dependencies: prop-types "^15.7.2" -"@dhis2/app-runtime@^3.10.0-alpha.2", "@dhis2/app-runtime@^3.10.2": - version "3.10.2" - resolved "https://registry.yarnpkg.com/@dhis2/app-runtime/-/app-runtime-3.10.2.tgz#e82639bd68234bdeaf2f6d3c256dcdfcdd267da2" - integrity sha512-GiftKk8ZTXlPElXAgVJn41Vj6E1vEGTPGrjrqU7j41ZTYsg+tUcCkISNt1woe5l7E+8+y+9Fy4bgqSsBOAEUvg== +"@dhis2/app-runtime@^3.10.4": + version "3.10.4" + resolved "https://registry.yarnpkg.com/@dhis2/app-runtime/-/app-runtime-3.10.4.tgz#6064ac728770cc94c4d1975db32bd38533655cc6" + integrity sha512-W/d0WcYYcKAeE5/xCunZEMYUSD1fxG+JDQdRDEUsH5y5hB8i/4o2QQrZK8xa19Z3xQJhaW5ypWWqIQVjTJT2Ww== dependencies: - "@dhis2/app-service-alerts" "3.10.2" - "@dhis2/app-service-config" "3.10.2" - "@dhis2/app-service-data" "3.10.2" - "@dhis2/app-service-offline" "3.10.2" - "@dhis2/app-service-plugin" "3.10.2" + "@dhis2/app-service-alerts" "3.10.4" + "@dhis2/app-service-config" "3.10.4" + "@dhis2/app-service-data" "3.10.4" + "@dhis2/app-service-offline" "3.10.4" + "@dhis2/app-service-plugin" "3.10.4" -"@dhis2/app-service-alerts@3.10.2": - version "3.10.2" - resolved "https://registry.yarnpkg.com/@dhis2/app-service-alerts/-/app-service-alerts-3.10.2.tgz#0e07c3530606f81ab998a20f2c478600b6027a77" - integrity sha512-2IqaawnlOzYVJLBF2AKVQJ4cuxJNZD7FK0XE0XOv1WwFs70h6bp23MQueIJ/QHxLo7lamE0FC22m4diM4P0CuA== +"@dhis2/app-service-alerts@3.10.4": + version "3.10.4" + resolved "https://registry.yarnpkg.com/@dhis2/app-service-alerts/-/app-service-alerts-3.10.4.tgz#a7cce660015d79980679175e677cf6c6c3f4c7eb" + integrity sha512-DmSLx/kHOHpgGiL8zG0oa6D3MeCY3wPMDGqj+Gfegr654Lmyf4d2vLI7HSZUSOCdraP/fSYTypsdZmWYoXoLBQ== -"@dhis2/app-service-config@3.10.2": - version "3.10.2" - resolved "https://registry.yarnpkg.com/@dhis2/app-service-config/-/app-service-config-3.10.2.tgz#be52676068e31cdb1fe3f8ddabb8153e1cd6e3e6" - integrity sha512-Crw7Tx4yg4qWw3qYxNCIye77IaY2HUYyDmDKPVVWzgmrcSGxpunv/NtsUg12pxrVfVLnqlH9L6AF9A6hO0afmw== +"@dhis2/app-service-config@3.10.4": + version "3.10.4" + resolved "https://registry.yarnpkg.com/@dhis2/app-service-config/-/app-service-config-3.10.4.tgz#2bede4df9b036350200cbc085a2a68439fa4fa0a" + integrity sha512-SCFdNxJKpiBjYsU9s0R+u9GrXjzmUEpGpudmC5eQqNV6ajLiebe/pS2jcSPFzjUtHVQMADk0X8TkERoOBqWcxA== -"@dhis2/app-service-data@3.10.2": - version "3.10.2" - resolved "https://registry.yarnpkg.com/@dhis2/app-service-data/-/app-service-data-3.10.2.tgz#e94d45d87cab5e156decfe9e92e3153e5df68ba0" - integrity sha512-+ESLrVEDQKXBaQmpaCq78RonkqJM2BliykaO4QBeOc4ilWohaqYajue1Ntg4uV2KrdkCylBdMDwGYjsak0G7hg== +"@dhis2/app-service-data@3.10.4": + version "3.10.4" + resolved "https://registry.yarnpkg.com/@dhis2/app-service-data/-/app-service-data-3.10.4.tgz#dcd993a24d2edd97e7ad8a042a682e60582740ff" + integrity sha512-RaoWniioCe33PcPZoDuO66qOrIt0JeeCN8RzmCDrRVGvGmlDTZ3hNuWm9CnsAvO1U6sYDiulKPqrEQu8YKMG0w== dependencies: react-query "^3.13.11" @@ -2106,30 +2126,30 @@ "@dhis2/app-service-data" "^2.1.1" uuid "^8.1.0" -"@dhis2/app-service-offline@3.10.2": - version "3.10.2" - resolved "https://registry.yarnpkg.com/@dhis2/app-service-offline/-/app-service-offline-3.10.2.tgz#082279b7045e702c2eecda751d762225313156b0" - integrity sha512-bTp+CCRbyKt/0QADj0O6wLNWhi+6QDkjt2+sfpv3M8oKcftjaQDqedVoypZRA0nqvSdVL2ehtTzqMrrxu6jtZQ== +"@dhis2/app-service-offline@3.10.4": + version "3.10.4" + resolved "https://registry.yarnpkg.com/@dhis2/app-service-offline/-/app-service-offline-3.10.4.tgz#dcdaf3a76c6c7a71f28c89a403ec130bf10fcdf3" + integrity sha512-SUUS+sw3FjR0TMdKSSOVzL8IfPA185gSTHQ1WE4tLc2zE92elvxLL9FuSUuTbu+l1Kr4nRQNLh8muOMWKGnWDg== dependencies: lodash "^4.17.21" -"@dhis2/app-service-plugin@3.10.2": - version "3.10.2" - resolved "https://registry.yarnpkg.com/@dhis2/app-service-plugin/-/app-service-plugin-3.10.2.tgz#09de64ee59017c86c8dab96a0d2ca0d915ae9d31" - integrity sha512-FqR6ILmvAXT2n1SzCZknT+5jJRdajg1dBegWAu3xqZXAntsM4wvFLCx6EtjS5LO2Kga9VZ+TJmVr2UFX1330CQ== +"@dhis2/app-service-plugin@3.10.4": + version "3.10.4" + resolved "https://registry.yarnpkg.com/@dhis2/app-service-plugin/-/app-service-plugin-3.10.4.tgz#f5412a1320393042012dd75713e3215e51628554" + integrity sha512-GW6xa/5y2yFXvhtLConnaOxKqyu6VPZWRBaQR73/bRRmFcnd7hlMkZ2M0GWSjoW4QHLXlLhXHFsgHPETBftkPg== dependencies: post-robot "^10.0.46" -"@dhis2/app-shell@10.5.0-alpha.2": - version "10.5.0-alpha.2" - resolved "https://registry.yarnpkg.com/@dhis2/app-shell/-/app-shell-10.5.0-alpha.2.tgz#3e082cc65ae5e3652502ac54ef2557c9bf99653b" - integrity sha512-9Ar9qpYaNM/L41P97BtaDemMP/8d7VL9lEhXCLli9YPw4fYfTSl2oZu7R4/NvdHWKI7odvogfab4U9Izbjg9wQ== +"@dhis2/app-shell@11.3.0": + version "11.3.0" + resolved "https://registry.yarnpkg.com/@dhis2/app-shell/-/app-shell-11.3.0.tgz#33fea2a2b6a1ee71962778c5c645b3690b10677a" + integrity sha512-beIch8qfOD0e6AeY5qnu/wNUYRUw/IDoDiwGgHU/sjnrs23n16DJXmFv8+fTo+oNOF1NIVUvqOArm9VqkqkPAw== dependencies: - "@dhis2/app-adapter" "10.5.0-alpha.2" - "@dhis2/app-runtime" "^3.10.0-alpha.2" + "@dhis2/app-adapter" "11.3.0" + "@dhis2/app-runtime" "^3.10.4" "@dhis2/d2-i18n" "^1.1.1" - "@dhis2/pwa" "10.5.0-alpha.2" - "@dhis2/ui" "^8.12.3" + "@dhis2/pwa" "11.3.0" + "@dhis2/ui" "^9.4.4" classnames "^2.2.6" moment "^2.29.1" post-robot "^10.0.46" @@ -2142,10 +2162,10 @@ typeface-roboto "^0.0.75" typescript "^3.6.3" -"@dhis2/cli-app-scripts@10.5.0-alpha.2": - version "10.5.0-alpha.2" - resolved "https://registry.yarnpkg.com/@dhis2/cli-app-scripts/-/cli-app-scripts-10.5.0-alpha.2.tgz#9481a4c3bb8d023bcee0e8c1796f8a30f9906c58" - integrity sha512-ez8D16+P2Sy5DLnSC7LvqqXH0nVe2VnjLn3mNQIYJb5NjRyNng4GXbpA6dbdFsXBaRfKYKzaQ5ArC5t2gPfUjw== +"@dhis2/cli-app-scripts@^11.3.0": + version "11.3.0" + resolved "https://registry.yarnpkg.com/@dhis2/cli-app-scripts/-/cli-app-scripts-11.3.0.tgz#8a05577f981f4d51e537a514a37291a8111f464f" + integrity sha512-wJmjb6iFNR77LYyxLyuPcjmI/nd5hYRUwrcJk1KpUvy3v2VhhPCeKYW8fipTwVs/JayN9YcsfWSH4PskbK8/dQ== dependencies: "@babel/core" "^7.6.2" "@babel/plugin-proposal-class-properties" "^7.8.3" @@ -2154,7 +2174,7 @@ "@babel/preset-env" "^7.14.7" "@babel/preset-react" "^7.0.0" "@babel/preset-typescript" "^7.6.0" - "@dhis2/app-shell" "10.5.0-alpha.2" + "@dhis2/app-shell" "11.3.0" "@dhis2/cli-helpers-engine" "^3.2.0" "@jest/core" "^27.0.6" "@pmmmwh/react-refresh-webpack-plugin" "^0.5.4" @@ -2211,10 +2231,10 @@ update-notifier "^3.0.0" yargs "^13.1.0" -"@dhis2/cli-style@^10.5.1": - version "10.5.1" - resolved "https://registry.yarnpkg.com/@dhis2/cli-style/-/cli-style-10.5.1.tgz#cf2df63b5eb203e3e3cec867bb9ba53b0d6f2ed6" - integrity sha512-epMQFxX+A7HzivXMqX5pHSJqP/CRw94HHWOZ+ab8Ug930Y3gF8YG1QtXgfvdMFz7u+LfQlLujj+DgVa/6W5GTQ== +"@dhis2/cli-style@^10.7.3": + version "10.7.3" + resolved "https://registry.yarnpkg.com/@dhis2/cli-style/-/cli-style-10.7.3.tgz#38cd2b6672fca44d9e72c64583ce7550e123686a" + integrity sha512-uqlJwV2hegPNgxpoqWH5nZhqBSvPH2GJ0Uoeaw7OpiHKFauOFUTuUiy6MGwUZqtgEAbmcq0DbyDexNQ/UqHQLQ== dependencies: "@commitlint/cli" "^12.1.4" "@commitlint/config-conventional" "^13.1.0" @@ -2225,14 +2245,20 @@ eslint-config-prettier "^8.3.0" eslint-plugin-import "^2.22.1" eslint-plugin-react "^7.31.10" + eslint-plugin-react-hooks "^4.6.2" fast-glob "^3.2.5" find-up "^5.0.0" fs-extra "^10.0.0" husky "^7.0.2" micromatch "^4.0.4" perfy "^1.1.5" + postcss "^8.4.38" + postcss-styled-jsx "^1.0.1" + postcss-syntax "^0.36.2" prettier "^2.4.1" semver "^7.3.5" + stylelint "^16.3.1" + stylelint-use-logical "^2.1.2" yargs "^16.2.0" "@dhis2/cypress-commands@^10.0.3": @@ -2285,10 +2311,10 @@ resolved "https://registry.yarnpkg.com/@dhis2/prop-types/-/prop-types-3.1.2.tgz#65b8ad2da8cd2f72bc8b951049a6c9d1b97af3e9" integrity sha512-eM0jjLOWvtXWqSFp5YC4DHFpkP8Y1D2eUwGV7MBWjni+o27oesVan+oT7WHeOeLdlAd4acRJrnaaAyB4Ck1wGQ== -"@dhis2/pwa@10.5.0-alpha.2": - version "10.5.0-alpha.2" - resolved "https://registry.yarnpkg.com/@dhis2/pwa/-/pwa-10.5.0-alpha.2.tgz#dff4f379832c3e857d73a58761c2b8387ea4a418" - integrity sha512-WWOzJukZjoX2TZiz8STj7miCMytWm4uj/jytVv4R912ilcpdW3g7I2H0ta7QN7hhIxidIirj2vDx1TFt1effOQ== +"@dhis2/pwa@11.3.0": + version "11.3.0" + resolved "https://registry.yarnpkg.com/@dhis2/pwa/-/pwa-11.3.0.tgz#188f756ad2d95f5df4c32fe904118b066c31cead" + integrity sha512-e+Lc4xHFxpMLEn9Efopdmh/R1iqqXG+gJhizq5B8tFtctNohUiy/RgwxqfsquRbayNU6Gm6aKDp7dMbqEf4ZAQ== dependencies: idb "^6.0.0" workbox-core "^6.1.5" @@ -2328,7 +2354,7 @@ resolved "https://registry.yarnpkg.com/@dhis2/ui-icons/-/ui-icons-9.4.4.tgz#c4f488496389687ebd47266e93e0aacf27054ef3" integrity sha512-AGt+aYqpqb7f/2IH5quZ1bJoSz/WB3p7I1CdZHUPk/XP6rQpO2W7mqoLxiZYOHCiNlTU+sjfXcYauHaWZSTdjw== -"@dhis2/ui@^8.12.3", "@dhis2/ui@^9.2.0", "@dhis2/ui@^9.4.4": +"@dhis2/ui@^9.4.4": version "9.4.4" resolved "https://registry.yarnpkg.com/@dhis2/ui/-/ui-9.4.4.tgz#ae7961d42753d72e209f7d11b160b3179e6a6452" integrity sha512-w1NMZy/S5tNbXGt7F5J5OM1P8qgq1Bo1ifV34YV3Cs+8rJYkHHsFOokUN+wSTdXUWqIKxOGrRoQkmgmjQ19WlA== @@ -2414,6 +2440,11 @@ dependencies: tslib "^2.0.0" +"@dual-bundle/import-meta-resolve@^4.1.0": + version "4.1.0" + resolved "https://registry.yarnpkg.com/@dual-bundle/import-meta-resolve/-/import-meta-resolve-4.1.0.tgz#519c1549b0e147759e7825701ecffd25e5819f7b" + integrity sha512-+nxncfwHM5SgAtrVzgpzJOI1ol0PkumhVo469KCf9lUi21IGcY90G98VuHm9VRrUypmAzawAHO9bs6hqeADaVg== + "@eslint/eslintrc@^0.4.3": version "0.4.3" resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c" @@ -4678,6 +4709,11 @@ balanced-match@^1.0.0: resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= +balanced-match@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-2.0.0.tgz#dc70f920d78db8b858535795867bf48f820633d9" + integrity sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA== + base64-js@^1.0.2, base64-js@^1.3.1: version "1.5.1" resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" @@ -4861,12 +4897,12 @@ braces@^2.3.1: split-string "^3.0.2" to-regex "^3.0.1" -braces@^3.0.2, braces@~3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" - integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== +braces@^3.0.3, braces@~3.0.2: + version "3.0.3" + resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789" + integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA== dependencies: - fill-range "^7.0.1" + fill-range "^7.1.1" broadcast-channel@^3.4.1: version "3.7.0" @@ -5597,7 +5633,7 @@ color-name@^1.1.4, color-name@~1.1.4: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== -colord@^2.9.1: +colord@^2.9.1, colord@^2.9.3: version "2.9.3" resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.3.tgz#4f8ce919de456f1d5c1c368c307fe20f3e59fb43" integrity sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw== @@ -5887,6 +5923,16 @@ cosmiconfig@^7.0.0: path-type "^4.0.0" yaml "^1.10.0" +cosmiconfig@^9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-9.0.0.tgz#34c3fc58287b915f3ae905ab6dc3de258b55ad9d" + integrity sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg== + dependencies: + env-paths "^2.2.1" + import-fresh "^3.3.0" + js-yaml "^4.1.0" + parse-json "^5.2.0" + crc32-stream@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-3.0.1.tgz#cae6eeed003b0e44d739d279de5ae63b171b4e85" @@ -6027,6 +6073,11 @@ css-declaration-sorter@^6.3.0: resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.3.0.tgz#72ebd995c8f4532ff0036631f7365cce9759df14" integrity sha512-OGT677UGHJTAVMRhPO+HJ4oKln3wkBTwtDFH0ojbqm+MJm6xuDMHp2nkhh/ThaBqq20IbraBQSWKfSLNHQO9Og== +css-functions-list@^3.2.2: + version "3.2.2" + resolved "https://registry.yarnpkg.com/css-functions-list/-/css-functions-list-3.2.2.tgz#9a54c6dd8416ed25c1079cd88234e927526c1922" + integrity sha512-c+N0v6wbKVxTu5gOBBFkr9BEdBWaqqjQeiJ8QvSRIJOf+UxlJh930m8e6/WNeODIK0mYLFkoONrnj16i2EcvfQ== + css-has-pseudo@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/css-has-pseudo/-/css-has-pseudo-3.0.4.tgz#57f6be91ca242d5c9020ee3e51bbb5b89fc7af73" @@ -6117,6 +6168,14 @@ css-tree@^1.1.2, css-tree@^1.1.3: mdn-data "2.0.14" source-map "^0.6.1" +css-tree@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-2.3.1.tgz#10264ce1e5442e8572fc82fbe490644ff54b5c20" + integrity sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw== + dependencies: + mdn-data "2.0.30" + source-map-js "^1.0.1" + css-what@2.1: version "2.1.3" resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2" @@ -6948,6 +7007,11 @@ entities@^2.0.0: resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.2.tgz#ac74db0bba8d33808bbf36809c3a5c3683531436" integrity sha512-dmD3AvJQBUjKpcNkoqr+x+IF0SdRtPz9Vk0uTy4yWqga9ibB6s4v++QFWNohjiUGoMlF552ZvNyXDxz5iW0qmw== +env-paths@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2" + integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A== + enzyme-adapter-react-16@^1.15.7: version "1.15.7" resolved "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.15.7.tgz#a737e6d8e2c147e9da5acf957755be7634f76201" @@ -7275,10 +7339,10 @@ eslint-plugin-jsx-a11y@^6.5.1: minimatch "^3.1.2" semver "^6.3.0" -eslint-plugin-react-hooks@^4.2.0, eslint-plugin-react-hooks@^4.3.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz#4c3e697ad95b77e93f8646aaa1630c1ba607edd3" - integrity sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g== +eslint-plugin-react-hooks@^4.2.0, eslint-plugin-react-hooks@^4.3.0, eslint-plugin-react-hooks@^4.6.2: + version "4.6.2" + resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.2.tgz#c829eb06c0e6f484b3fbb85a97e57784f328c596" + integrity sha512-QzliNJq4GinDBcD8gPB5v0wh6g8q3SUi6EFF0x8N/BL9PoVs0atuGc47ozMRyOWAKdwaZ5OnbOEa3WR+dSGKuQ== eslint-plugin-react@^7.27.1, eslint-plugin-react@^7.31.10: version "7.32.2" @@ -7765,10 +7829,10 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== -fast-glob@^3.2.11, fast-glob@^3.2.5, fast-glob@^3.2.9: - version "3.2.11" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9" - integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew== +fast-glob@^3.2.11, fast-glob@^3.2.5, fast-glob@^3.2.9, fast-glob@^3.3.2: + version "3.3.2" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129" + integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow== dependencies: "@nodelib/fs.stat" "^2.0.2" "@nodelib/fs.walk" "^1.2.3" @@ -7791,6 +7855,11 @@ fast-safe-stringify@^2.0.7: resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz#c406a83b6e70d9e35ce3b30a81141df30aeba884" integrity sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA== +fastest-levenshtein@^1.0.16: + version "1.0.16" + resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5" + integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg== + fastq@^1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.6.0.tgz#4ec8a38f4ac25f21492673adb7eae9cfef47d1c2" @@ -7833,6 +7902,13 @@ file-entry-cache@^6.0.1: dependencies: flat-cache "^3.0.4" +file-entry-cache@^9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-9.0.0.tgz#4478e7ceaa5191fa9676a2daa7030211c31b1e7e" + integrity sha512-6MgEugi8p2tiUhqO7GnPsmbCCzj0YRCwwaTbpGRyKZesjRSzkqkAE9fPp7V2yMs5hwfgbQLgdvSSkGNg1s5Uvw== + dependencies: + flat-cache "^5.0.0" + file-loader@^6.2.0: version "6.2.0" resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.2.0.tgz#baef7cf8e1840df325e4390b4484879480eebe4d" @@ -7868,10 +7944,10 @@ fill-range@^4.0.0: repeat-string "^1.6.1" to-regex-range "^2.1.0" -fill-range@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" - integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== +fill-range@^7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292" + integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg== dependencies: to-regex-range "^5.0.1" @@ -7956,15 +8032,23 @@ flat-cache@^3.0.4: flatted "^3.1.0" rimraf "^3.0.2" +flat-cache@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-5.0.0.tgz#26c4da7b0f288b408bb2b506b2cb66c240ddf062" + integrity sha512-JrqFmyUl2PnPi1OvLyTVHnQvwQ0S+e6lGSwu8OkAZlSaNIZciTY2H/cOOROxsBA1m/LZNHDsqAgDZt6akWcjsQ== + dependencies: + flatted "^3.3.1" + keyv "^4.5.4" + flat@^5.0.2: version "5.0.2" resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241" integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ== -flatted@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.0.tgz#a5d06b4a8b01e3a63771daa5cb7a1903e2e57067" - integrity sha512-tW+UkmtNg/jv9CSofAKvgVcO7c2URjhTdW1ZTkcAritblu8tajiYy7YisnIflEwtKssCtOxpnBRoCB7iap0/TA== +flatted@^3.1.0, flatted@^3.3.1: + version "3.3.1" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.1.tgz#21db470729a6734d4997002f439cb308987f567a" + integrity sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw== flow-parser@0.*: version "0.144.0" @@ -8423,6 +8507,11 @@ globby@^11.0.4, globby@^11.1.0: merge2 "^1.4.1" slash "^3.0.0" +globjoin@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/globjoin/-/globjoin-0.1.4.tgz#2f4494ac8919e3767c5cbb691e9f463324285d43" + integrity sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg== + globule@^1.0.0: version "1.3.1" resolved "https://registry.yarnpkg.com/globule/-/globule-1.3.1.tgz#90a25338f22b7fbeb527cee63c629aea754d33b9" @@ -8719,6 +8808,11 @@ html-minifier-terser@^6.0.2: relateurl "^0.2.7" terser "^5.10.0" +html-tags@^3.3.1: + version "3.3.1" + resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.3.1.tgz#a04026a18c882e4bba8a01a3d39cfe465d40b5ce" + integrity sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ== + html-webpack-plugin@^5.5.0: version "5.5.0" resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-5.5.0.tgz#c3911936f57681c1f9f4d8b68c158cd9dfe52f50" @@ -8964,17 +9058,17 @@ ignore@^4.0.6: resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== -ignore@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a" - integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ== +ignore@^5.2.0, ignore@^5.3.1: + version "5.3.1" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.1.tgz#5073e554cd42c5b33b394375f538b8593e34d4ef" + integrity sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw== immer@^9.0.7: version "9.0.15" resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.15.tgz#0b9169e5b1d22137aba7d43f8a81a495dd1b62dc" integrity sha512-2eB/sswms9AEUSkOm4SbV5Y7Vmt/bKRwByd52jfLkW4OLYeaTP3EEiJ9agqU0O/tq6Dk62Zfj+TJSqfm1rLVGQ== -import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1: +import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1, import-fresh@^3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw== @@ -9397,6 +9491,11 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4: dependencies: isobject "^3.0.1" +is-plain-object@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344" + integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q== + is-potential-custom-element-name@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5" @@ -10396,6 +10495,11 @@ json-buffer@3.0.0: resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898" integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg= +json-buffer@3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13" + integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ== + json-parse-better-errors@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" @@ -10526,6 +10630,13 @@ keyv@^3.0.0: dependencies: json-buffer "3.0.0" +keyv@^4.5.4: + version "4.5.4" + resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93" + integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw== + dependencies: + json-buffer "3.0.1" + kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: version "3.2.2" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" @@ -10560,6 +10671,11 @@ klona@^2.0.4, klona@^2.0.5: resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc" integrity sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ== +known-css-properties@^0.31.0: + version "0.31.0" + resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.31.0.tgz#5c8d9d8777b3ca09482b2397f6a241e5d69a1023" + integrity sha512-sBPIUGTNF0czz0mwGGUoKKJC8Q7On1GPbCSFPfyEsfHb2DyBG0Y4QtV+EVWpINSaiGKZblDNuF5AezxSgOhesQ== + labeled-stream-splicer@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/labeled-stream-splicer/-/labeled-stream-splicer-2.0.2.tgz#42a41a16abcd46fd046306cf4f2c3576fffb1c21" @@ -11116,6 +11232,11 @@ mathjs@^9.4.2: tiny-emitter "^2.1.0" typed-function "^2.0.0" +mathml-tag-names@^2.1.3: + version "2.1.3" + resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" + integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== + md5.js@^1.3.4: version "1.3.5" resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f" @@ -11130,6 +11251,11 @@ mdn-data@2.0.14: resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50" integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow== +mdn-data@2.0.30: + version "2.0.30" + resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.30.tgz#ce4df6f80af6cfbe218ecd5c552ba13c4dfa08cc" + integrity sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA== + mdn-data@2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.4.tgz#699b3c38ac6f1d728091a64650b65d388502fd5b" @@ -11157,6 +11283,11 @@ memoize-one@^5.0.1, memoize-one@^5.1.1: resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.2.1.tgz#8337aa3c4335581839ec01c3d594090cebe8f00e" integrity sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q== +meow@^13.2.0: + version "13.2.0" + resolved "https://registry.yarnpkg.com/meow/-/meow-13.2.0.tgz#6b7d63f913f984063b3cc261b6e8800c4cd3474f" + integrity sha512-pxQJQzB6djGPXh08dacEloMFopsOqGVRKFPYvPOt9XDZ1HasbgDZA74CJGreSU4G3Ak7EFJGoiH2auq+yXISgA== + meow@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/meow/-/meow-5.0.0.tgz#dfc73d63a9afc714a5e371760eb5c88b91078aa4" @@ -11211,12 +11342,12 @@ micromatch@^3.1.10, micromatch@^3.1.4: snapdragon "^0.8.1" to-regex "^3.0.2" -micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5: - version "4.0.5" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" - integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== +micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5, micromatch@^4.0.7: + version "4.0.7" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.7.tgz#33e8190d9fe474a9895525f5618eee136d46c2e5" + integrity sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q== dependencies: - braces "^3.0.2" + braces "^3.0.3" picomatch "^2.3.1" microseconds@0.2.0: @@ -11448,10 +11579,10 @@ nanoid@3.3.3: resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.3.tgz#fd8e8b7aa761fe807dba2d1b98fb7241bb724a25" integrity sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w== -nanoid@^3.3.4: - version "3.3.4" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab" - integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw== +nanoid@^3.3.7: + version "3.3.7" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8" + integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g== nanomatch@^1.2.9: version "1.2.13" @@ -12172,10 +12303,10 @@ picocolors@^0.2.1: resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f" integrity sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA== -picocolors@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" - integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== +picocolors@^1.0.0, picocolors@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.1.tgz#a8ad579b571952f0e5d25892de5445bcfe25aaa1" + integrity sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew== picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.2.3, picomatch@^2.3.1: version "2.3.1" @@ -12753,6 +12884,16 @@ postcss-replace-overflow-wrap@^4.0.0: resolved "https://registry.yarnpkg.com/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz#d2df6bed10b477bf9c52fab28c568b4b29ca4319" integrity sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw== +postcss-resolve-nested-selector@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz#29ccbc7c37dedfac304e9fff0bf1596b3f6a0e4e" + integrity sha512-HvExULSwLqHLgUy1rl3ANIqCsvMS0WHss2UOsXhXnQaZ9VCc2oBvIpXrl00IUFT5ZDITME0o6oiXeiHr2SAIfw== + +postcss-safe-parser@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-7.0.0.tgz#6273d4e5149e286db5a45bc6cf6eafcad464014a" + integrity sha512-ovehqRNVCpuFzbXoTb4qLtyzK3xn3t/CUBxOs8LsnQjQrShaB4lKiHoVqY8ANaC0hBMHq5QVWk77rwGklFUDrg== + postcss-selector-not@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/postcss-selector-not/-/postcss-selector-not-6.0.1.tgz#8f0a709bf7d4b45222793fc34409be407537556d" @@ -12760,14 +12901,19 @@ postcss-selector-not@^6.0.1: dependencies: postcss-selector-parser "^6.0.10" -postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.6, postcss-selector-parser@^6.0.9: - version "6.0.10" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz#79b61e2c0d1bfc2602d549e11d0876256f8df88d" - integrity sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w== +postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.6, postcss-selector-parser@^6.0.9, postcss-selector-parser@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.1.0.tgz#49694cb4e7c649299fea510a29fa6577104bcf53" + integrity sha512-UMz42UD0UY0EApS0ZL9o1XnLhSTtvvvLe5Dc2H2O56fvRZi+KulDyf5ctDhhtYJBGKStV2FL1fy6253cmLgqVQ== dependencies: cssesc "^3.0.0" util-deprecate "^1.0.2" +postcss-styled-jsx@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/postcss-styled-jsx/-/postcss-styled-jsx-1.0.1.tgz#07c17ca3bc574a06627103bb5dd475006c2d0d9e" + integrity sha512-508Vg2A0pHQstRxz8eoNYiT+RiCZdgE4EqN0x8oiPIZ/a6pp5q2NYefL39RRG8ORlxDehLHU3u/EOpux0kuATQ== + postcss-svgo@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-5.1.0.tgz#0a317400ced789f233a28826e77523f15857d80d" @@ -12776,6 +12922,11 @@ postcss-svgo@^5.1.0: postcss-value-parser "^4.2.0" svgo "^2.7.0" +postcss-syntax@^0.36.2: + version "0.36.2" + resolved "https://registry.yarnpkg.com/postcss-syntax/-/postcss-syntax-0.36.2.tgz#f08578c7d95834574e5593a82dfbfa8afae3b51c" + integrity sha512-nBRg/i7E3SOHWxF3PpF5WnJM/jQ1YpY9000OaVXlAQj6Zp/kIqJxEDWIZ67tAd7NLuk7zqN4yqe9nc0oNAOs1w== + postcss-unique-selectors@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz#a9f273d1eacd09e9aa6088f4b0507b18b1b541b6" @@ -12796,14 +12947,14 @@ postcss@^7.0.35: picocolors "^0.2.1" source-map "^0.6.1" -postcss@^8.3.5, postcss@^8.4.14, postcss@^8.4.4, postcss@^8.4.7: - version "8.4.16" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.16.tgz#33a1d675fac39941f5f445db0de4db2b6e01d43c" - integrity sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ== +postcss@^8.3.5, postcss@^8.4.14, postcss@^8.4.38, postcss@^8.4.4, postcss@^8.4.7: + version "8.4.38" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.38.tgz#b387d533baf2054288e337066d81c6bee9db9e0e" + integrity sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A== dependencies: - nanoid "^3.3.4" + nanoid "^3.3.7" picocolors "^1.0.0" - source-map-js "^1.0.2" + source-map-js "^1.2.0" postinstall-postinstall@^2.1.0: version "2.1.0" @@ -14230,6 +14381,11 @@ signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3: resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== +signal-exit@^4.0.1: + version "4.1.0" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04" + integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw== + simple-concat@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f" @@ -14342,10 +14498,10 @@ source-map-explorer@^2.1.0: temp "^0.9.1" yargs "^15.3.1" -source-map-js@^1.0.1, source-map-js@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" - integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== +source-map-js@^1.0.1, source-map-js@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af" + integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg== source-map-loader@^3.0.0: version "3.0.1" @@ -14663,14 +14819,14 @@ string-width@^3.0.0, string-width@^3.1.0: is-fullwidth-code-point "^2.0.0" strip-ansi "^5.1.0" -string-width@^4.1.0, string-width@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5" - integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg== +string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== dependencies: emoji-regex "^8.0.0" is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.0" + strip-ansi "^6.0.1" string.prototype.matchall@^4.0.6, string.prototype.matchall@^4.0.8: version "4.0.8" @@ -14757,10 +14913,10 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1: dependencies: ansi-regex "^5.0.1" -strip-ansi@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.0.1.tgz#61740a08ce36b61e50e65653f07060d000975fb2" - integrity sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw== +strip-ansi@^7.0.1, strip-ansi@^7.1.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45" + integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ== dependencies: ansi-regex "^6.0.1" @@ -14831,6 +14987,56 @@ stylehacks@^5.1.0: browserslist "^4.16.6" postcss-selector-parser "^6.0.4" +stylelint-use-logical@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/stylelint-use-logical/-/stylelint-use-logical-2.1.2.tgz#60296915cc27aa1292fbff9a29391c9a1d877563" + integrity sha512-4ffvPNk/swH4KS3izExWuzQOuzLmi0gb0uOhvxWJ20vDA5W5xKCjcHHtLoAj1kKvTIX6eGIN5xGtaVin9PD0wg== + +stylelint@^16.3.1: + version "16.6.1" + resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-16.6.1.tgz#84735aca2bb5cde535572b7a9b878d2ec983a570" + integrity sha512-yNgz2PqWLkhH2hw6X9AweV9YvoafbAD5ZsFdKN9BvSDVwGvPh+AUIrn7lYwy1S7IHmtFin75LLfX1m0D2tHu8Q== + dependencies: + "@csstools/css-parser-algorithms" "^2.6.3" + "@csstools/css-tokenizer" "^2.3.1" + "@csstools/media-query-list-parser" "^2.1.11" + "@csstools/selector-specificity" "^3.1.1" + "@dual-bundle/import-meta-resolve" "^4.1.0" + balanced-match "^2.0.0" + colord "^2.9.3" + cosmiconfig "^9.0.0" + css-functions-list "^3.2.2" + css-tree "^2.3.1" + debug "^4.3.4" + fast-glob "^3.3.2" + fastest-levenshtein "^1.0.16" + file-entry-cache "^9.0.0" + global-modules "^2.0.0" + globby "^11.1.0" + globjoin "^0.1.4" + html-tags "^3.3.1" + ignore "^5.3.1" + imurmurhash "^0.1.4" + is-plain-object "^5.0.0" + known-css-properties "^0.31.0" + mathml-tag-names "^2.1.3" + meow "^13.2.0" + micromatch "^4.0.7" + normalize-path "^3.0.0" + picocolors "^1.0.1" + postcss "^8.4.38" + postcss-resolve-nested-selector "^0.1.1" + postcss-safe-parser "^7.0.0" + postcss-selector-parser "^6.1.0" + postcss-value-parser "^4.2.0" + resolve-from "^5.0.0" + string-width "^4.2.3" + strip-ansi "^7.1.0" + supports-hyperlinks "^3.0.0" + svg-tags "^1.0.0" + table "^6.8.2" + write-file-atomic "^5.0.1" + stylis-rule-sheet@0.0.10: version "0.0.10" resolved "https://registry.yarnpkg.com/stylis-rule-sheet/-/stylis-rule-sheet-0.0.10.tgz#44e64a2b076643f4b52e5ff71efc04d8c3c4a430" @@ -14884,6 +15090,14 @@ supports-hyperlinks@^2.0.0: has-flag "^4.0.0" supports-color "^7.0.0" +supports-hyperlinks@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-3.0.0.tgz#c711352a5c89070779b4dad54c05a2f14b15c94b" + integrity sha512-QBDPHyPQDRTy9ku4URNGY5Lah8PAaXs6tAAwp55sL5WCsSW7GIfdf6W5ixfziW+t7wh3GVvHyHHyQ1ESsoRvaA== + dependencies: + has-flag "^4.0.0" + supports-color "^7.0.0" + supports-preserve-symlinks-flag@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" @@ -14894,6 +15108,11 @@ svg-parser@^2.0.2: resolved "https://registry.yarnpkg.com/svg-parser/-/svg-parser-2.0.4.tgz#fdc2e29e13951736140b76cb122c8ee6630eb6b5" integrity sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ== +svg-tags@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764" + integrity sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA== + svgo@^1.2.2: version "1.3.2" resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.3.2.tgz#b6dc511c063346c9e415b81e43401145b96d4167" @@ -14938,17 +15157,16 @@ syntax-error@^1.1.1: dependencies: acorn-node "^1.2.0" -table@^6.0.9: - version "6.7.1" - resolved "https://registry.yarnpkg.com/table/-/table-6.7.1.tgz#ee05592b7143831a8c94f3cee6aae4c1ccef33e2" - integrity sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg== +table@^6.0.9, table@^6.8.2: + version "6.8.2" + resolved "https://registry.yarnpkg.com/table/-/table-6.8.2.tgz#c5504ccf201213fa227248bdc8c5569716ac6c58" + integrity sha512-w2sfv80nrAh2VCbqR5AK27wswXhqcck2AhfnNW76beQXskGZ1V12GwS//yYVa3d3fcvAip2OUnbDAjW2k3v9fA== dependencies: ajv "^8.0.1" - lodash.clonedeep "^4.5.0" lodash.truncate "^4.4.2" slice-ansi "^4.0.0" - string-width "^4.2.0" - strip-ansi "^6.0.0" + string-width "^4.2.3" + strip-ansi "^6.0.1" tailwindcss@^3.0.2: version "3.1.8" @@ -16363,6 +16581,14 @@ write-file-atomic@^3.0.0: signal-exit "^3.0.2" typedarray-to-buffer "^3.1.5" +write-file-atomic@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-5.0.1.tgz#68df4717c55c6fa4281a7860b4c2ba0a6d2b11e7" + integrity sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw== + dependencies: + imurmurhash "^0.1.4" + signal-exit "^4.0.1" + ws@^5.2.0: version "5.2.3" resolved "https://registry.yarnpkg.com/ws/-/ws-5.2.3.tgz#05541053414921bc29c63bee14b8b0dd50b07b3d" From 7c1fffbb43f2f781daf84e3f94389b083f959723 Mon Sep 17 00:00:00 2001 From: Mozafar Haider Date: Mon, 3 Jun 2024 10:40:52 +0100 Subject: [PATCH 09/11] fix: manual updates for css logical properties using css2logical tool --- src/components/Layout/styles/Chip.module.css | 30 ++++++++++++---- .../styles/OutlierTablePlugin.module.css | 35 +++++++++++++++---- 2 files changed, 52 insertions(+), 13 deletions(-) diff --git a/src/components/Layout/styles/Chip.module.css b/src/components/Layout/styles/Chip.module.css index 9f79bd3097..e9a938bb4a 100644 --- a/src/components/Layout/styles/Chip.module.css +++ b/src/components/Layout/styles/Chip.module.css @@ -36,11 +36,17 @@ } .fixedDimensionIcon { - padding: 0 4px; + padding-block-start: 0; + padding-block-end: 0; + padding-inline-start: 4px; + padding-inline-end: 4px; } .leftIconWrapper { - padding: 0 4px; + padding-block-start: 0; + padding-block-end: 0; + padding-inline-start: 4px; + padding-inline-end: 4px; display: flex; align-items: center; } @@ -55,8 +61,14 @@ .lockIconWrapper { background: #cbe7e5; block-size: 20px; - padding: 0 2px 0 3px; - margin: 0 0 0 2px; + padding-block-start: 0; + padding-block-end: 0; + padding-inline-start: 3px; + padding-inline-end: 2px; + margin-block-start: 0; + margin-block-end: 0; + margin-inline-start: 2px; + margin-inline-end: 0; display: flex; align-items: center; justify-content: center; @@ -89,7 +101,10 @@ border-end-end-radius: 0px; align-items: center; min-block-size: 20px; - margin: 0 2px 0 0; + margin-block-start: 0; + margin-block-end: 0; + margin-inline-start: 0; + margin-inline-end: 2px; } .chipRight { @@ -112,7 +127,10 @@ margin-inline-start: 4px; min-inline-size: 12px; text-align: center; - padding: 2px 2px 1px 2px; + padding-block-start: 2px; + padding-block-end: 1px; + padding-inline-start: 2px; + padding-inline-end: 2px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; diff --git a/src/components/VisualizationPlugin/styles/OutlierTablePlugin.module.css b/src/components/VisualizationPlugin/styles/OutlierTablePlugin.module.css index 46a6d19914..f86e5c7023 100644 --- a/src/components/VisualizationPlugin/styles/OutlierTablePlugin.module.css +++ b/src/components/VisualizationPlugin/styles/OutlierTablePlugin.module.css @@ -3,7 +3,10 @@ gap: var(--spacers-dp4); min-inline-size: 0; inline-size: 100%; - margin: 0 var(--spacers-dp4) var(--spacers-dp4); + margin-block-start: 0; + margin-block-end: var(--spacers-dp4); + margin-inline-start: var(--spacers-dp4); + margin-inline-end: var(--spacers-dp4); } .visualizationContainer { display: flex; @@ -28,13 +31,22 @@ line-height: 12px; } .dataTable .headerCell.sizeComfortable { - padding: 8px 4px 6px 8px; + padding-block-start: 8px; + padding-block-end: 6px; + padding-inline-start: 8px; + padding-inline-end: 4px; } .dataTable .headerCell.sizeNormal { - padding: 4px 4px 2px 6px; + padding-block-start: 4px; + padding-block-end: 2px; + padding-inline-start: 6px; + padding-inline-end: 4px; } .dataTable .headerCell.sizeCompact { - padding: 3px 2px 1px 6px; + padding-block-start: 3px; + padding-block-end: 1px; + padding-inline-start: 6px; + padding-inline-end: 2px; } /* Table body cells in various sizes */ @@ -54,11 +66,20 @@ white-space: nowrap; } .dataTable .cell.sizeComfortable { - padding: 10px 8px 8px; + padding-block-start: 10px; + padding-block-end: 8px; + padding-inline-start: 8px; + padding-inline-end: 8px; } .dataTable .cell.sizeNormal { - padding: 7px 6px 5px; + padding-block-start: 7px; + padding-block-end: 5px; + padding-inline-start: 6px; + padding-inline-end: 6px; } .dataTable .cell.sizeCompact { - padding: 6px 6px 4px; + padding-block-start: 6px; + padding-block-end: 4px; + padding-inline-start: 6px; + padding-inline-end: 6px; } From 7625a0431d90a7253460b4a0871562fbdb2b9c13 Mon Sep 17 00:00:00 2001 From: Jen Jones Arnesen Date: Fri, 27 Sep 2024 11:17:30 +0200 Subject: [PATCH 10/11] fix: switch to css module which fixes styling issues in Vis Options --- src/components/AxesTabs/AxesTabs.js | 5 +- .../VisualizationOptions/InfoText.js | 12 +-- .../VisualizationOptions/NoticeBox.js | 4 +- .../Options/AxisLabels.js | 4 +- .../VisualizationOptions/Options/AxisRange.js | 9 +-- .../VisualizationOptions/Options/AxisTitle.js | 11 +-- .../Options/CheckboxBaseOption.js | 9 +-- .../VisualizationOptions/Options/ColorSet.js | 4 +- .../Options/CompletedOnly.js | 4 +- .../Options/ExtremeLines.js | 13 ++-- .../Options/HideSubtitle.js | 11 +-- .../VisualizationOptions/Options/HideTitle.js | 11 +-- .../VisualizationOptions/Options/Legend.js | 32 ++++---- .../Options/LegendDisplayStrategy.js | 4 +- .../Options/MeasureCriteria.js | 20 ++--- .../Options/NumberBaseType.js | 4 +- .../Options/OutlierDetectionMethod.js | 4 +- .../VisualizationOptions/Options/Outliers.js | 34 ++++---- .../Options/OutliersForOutlierTable.js | 11 +-- .../Options/OutliersMaxResults.js | 4 +- .../Options/PositiveNumberBaseType.js | 4 +- .../Options/RegressionLine.js | 14 ++-- .../Options/SelectBaseOption.js | 15 ++-- .../Options/TextBaseOption.js | 11 +-- .../styles/VisualizationOptions.module.css | 78 +++++++++++++++++++ yarn.lock | 46 +++-------- 26 files changed, 193 insertions(+), 185 deletions(-) create mode 100644 src/components/VisualizationOptions/styles/VisualizationOptions.module.css diff --git a/src/components/AxesTabs/AxesTabs.js b/src/components/AxesTabs/AxesTabs.js index 7bd1d21286..dfa622741a 100644 --- a/src/components/AxesTabs/AxesTabs.js +++ b/src/components/AxesTabs/AxesTabs.js @@ -2,7 +2,7 @@ import PropTypes from 'prop-types' import React, { useState } from 'react' import VerticalTab from '../VerticalTabBar/VerticalTab.js' import VerticalTabBar from '../VerticalTabBar/VerticalTabBar.js' -import { tabSectionTitle } from '../VisualizationOptions/styles/VisualizationOptions.style.js' +import tabStyles from '../VisualizationOptions/styles/VisualizationOptions.module.css' import styles from './styles/AxesTabs.module.css' const AxesTabs = ({ items, dataTest }) => { @@ -24,12 +24,11 @@ const AxesTabs = ({ items, dataTest }) => {
- + {items[selectedTabIndex].label} {items[selectedTabIndex].content}
- {tabSectionTitle.styles} ) } diff --git a/src/components/VisualizationOptions/InfoText.js b/src/components/VisualizationOptions/InfoText.js index 5debd6b34b..42af17114f 100644 --- a/src/components/VisualizationOptions/InfoText.js +++ b/src/components/VisualizationOptions/InfoText.js @@ -1,16 +1,12 @@ import { IconInfo16 } from '@dhis2/ui' import PropTypes from 'prop-types' import React from 'react' -import { - tabSectionOption, - tabSectionOptionText, - tabSectionOptionIcon, -} from './styles/VisualizationOptions.style.js' +import styles from './styles/VisualizationOptions.module.css' export const InfoText = ({ text }) => ( -
-

- +

+

+ {text} diff --git a/src/components/VisualizationOptions/NoticeBox.js b/src/components/VisualizationOptions/NoticeBox.js index 3402afcb38..9bb9108e39 100644 --- a/src/components/VisualizationOptions/NoticeBox.js +++ b/src/components/VisualizationOptions/NoticeBox.js @@ -1,10 +1,10 @@ import { NoticeBox as UiNoticeBox } from '@dhis2/ui' import PropTypes from 'prop-types' import React from 'react' -import { tabSectionOption } from './styles/VisualizationOptions.style.js' +import styles from './styles/VisualizationOptions.module.css' const NoticeBox = ({ title, text, warning = false, error = false }) => ( -

+
{text} diff --git a/src/components/VisualizationOptions/Options/AxisLabels.js b/src/components/VisualizationOptions/Options/AxisLabels.js index 0e1c0b4c27..ed75551fec 100644 --- a/src/components/VisualizationOptions/Options/AxisLabels.js +++ b/src/components/VisualizationOptions/Options/AxisLabels.js @@ -3,11 +3,11 @@ import i18n from '@dhis2/d2-i18n' import { Label } from '@dhis2/ui' import PropTypes from 'prop-types' import React from 'react' -import { tabSectionOption } from '../styles/VisualizationOptions.style.js' +import styles from '../styles/VisualizationOptions.module.css' import TextStyle from './TextStyle.js' const AxisLabels = ({ disabled, axisId }) => ( -
+
( -
+
-
+
{'\u00A0\u2013\u00A0'} diff --git a/src/components/VisualizationOptions/Options/AxisTitle.js b/src/components/VisualizationOptions/Options/AxisTitle.js index 4b93794c9f..5067e5a633 100644 --- a/src/components/VisualizationOptions/Options/AxisTitle.js +++ b/src/components/VisualizationOptions/Options/AxisTitle.js @@ -13,10 +13,7 @@ import { OPTION_AXIS_TITLE_TEXT_MODE, } from '../../../modules/options.js' import { sGetUiOption } from '../../../reducers/ui.js' -import { - tabSectionOption, - tabSectionOptionToggleable, -} from '../styles/VisualizationOptions.style.js' +import styles from '../styles/VisualizationOptions.module.css' import TextStyle from './TextStyle.js' export const TITLE_AUTO = 'AUTO' @@ -70,7 +67,7 @@ const AxisTitle = ({ return (
@@ -100,7 +97,7 @@ const AxisTitle = ({ ))} {textMode === TITLE_CUSTOM ? ( -
+
onTextChange(value)} @@ -113,7 +110,7 @@ const AxisTitle = ({
) : null} {textMode === TITLE_AUTO || textMode === TITLE_CUSTOM ? ( -
+
( -
+
{((!inverted && value) || (inverted && !value)) && fontStyleKey ? ( -
+
( -
+
{[ [ diff --git a/src/components/VisualizationOptions/Options/CompletedOnly.js b/src/components/VisualizationOptions/Options/CompletedOnly.js index 0b61c52cb2..f1835ed542 100644 --- a/src/components/VisualizationOptions/Options/CompletedOnly.js +++ b/src/components/VisualizationOptions/Options/CompletedOnly.js @@ -1,11 +1,11 @@ import i18n from '@dhis2/d2-i18n' import { Label } from '@dhis2/ui' import React from 'react' -import { tabSectionOption } from '../styles/VisualizationOptions.style.js' +import styles from '../styles/VisualizationOptions.module.css' import { CheckboxBaseOption } from './CheckboxBaseOption.js' const CompletedOnly = () => ( -
+
( <> -
-
+
+
{isEnabled && ( -
-
+
+
+