From 67ff60df723683b95bdbd3745eaece0bb16e3c34 Mon Sep 17 00:00:00 2001 From: braimbault Date: Wed, 20 Nov 2024 09:58:41 +0100 Subject: [PATCH] fix: PeriodDimension style --- .../edit/styles/LayerDialog.module.css | 6 --- .../edit/thematic/ThematicDialog.js | 43 +++++++++---------- yarn.lock | 11 +++-- 3 files changed, 26 insertions(+), 34 deletions(-) diff --git a/src/components/edit/styles/LayerDialog.module.css b/src/components/edit/styles/LayerDialog.module.css index e4e7cdde5..26111ae2e 100644 --- a/src/components/edit/styles/LayerDialog.module.css +++ b/src/components/edit/styles/LayerDialog.module.css @@ -109,12 +109,6 @@ margin: 8px 0 0 -8px; } -/* Periods */ - -.periodDimension { - height: 410px -} - /* Tracked entity */ .teiCheckbox { diff --git a/src/components/edit/thematic/ThematicDialog.js b/src/components/edit/thematic/ThematicDialog.js index 88ac4f569..485388873 100644 --- a/src/components/edit/thematic/ThematicDialog.js +++ b/src/components/edit/thematic/ThematicDialog.js @@ -1,4 +1,3 @@ -import cx from 'classnames' import { PeriodDimension } from '@dhis2/analytics' import i18n from '@dhis2/d2-i18n' import PropTypes from 'prop-types' @@ -51,11 +50,6 @@ import DimensionFilter from '../../dimensions/DimensionFilter.js' import IndicatorGroupSelect from '../../indicator/IndicatorGroupSelect.js' import IndicatorSelect from '../../indicator/IndicatorSelect.js' import OrgUnitSelect from '../../orgunits/OrgUnitSelect.js' -import PeriodSelect from '../../periods/PeriodSelect.js' -import PeriodTypeSelect from '../../periods/PeriodTypeSelect.js' -import RelativePeriodSelect from '../../periods/RelativePeriodSelect.js' -import RenderingStrategy from '../../periods/RenderingStrategy.js' -import StartEndDates from '../../periods/StartEndDates.js' import ProgramIndicatorSelect from '../../program/ProgramIndicatorSelect.js' import ProgramSelect from '../../program/ProgramSelect.js' import Labels from '../shared/Labels.js' @@ -77,8 +71,8 @@ class ThematicDialog extends Component { setNoDataColor: PropTypes.func.isRequired, setOperand: PropTypes.func.isRequired, setOrgUnits: PropTypes.func.isRequired, + //setPeriodType: PropTypes.func.isRequired, setPeriods: PropTypes.func.isRequired, - setPeriodType: PropTypes.func.isRequired, setProgram: PropTypes.func.isRequired, setRenderingStrategy: PropTypes.func.isRequired, setValueType: PropTypes.func.isRequired, @@ -88,7 +82,7 @@ class ThematicDialog extends Component { dataElementGroup: PropTypes.object, endDate: PropTypes.string, filters: PropTypes.array, - id: PropTypes.string, + //id: PropTypes.string, indicatorGroup: PropTypes.object, legendSet: PropTypes.object, method: PropTypes.number, @@ -96,7 +90,7 @@ class ThematicDialog extends Component { operand: PropTypes.bool, orgUnits: PropTypes.object, periodType: PropTypes.string, - periodsSettings: PropTypes.object, + //periodsSettings: PropTypes.object, program: PropTypes.object, radiusHigh: PropTypes.number, radiusLow: PropTypes.number, @@ -126,6 +120,7 @@ class ThematicDialog extends Component { setPeriods, setOrgUnits, } = this.props + console.log('🚀 ~ componentDidMount ~ this.props:', this.props) console.log( '🚀 ~ ThematicDialog ~ componentDidMount ~ filters:', filters @@ -141,6 +136,11 @@ class ThematicDialog extends Component { const { keyAnalysisRelativePeriod: defaultPeriod, hiddenPeriods } = systemSettings + console.log( + '🚀 ~ ThematicDialog ~ componentDidMount ~ systemSettings:', + systemSettings + ) + // Set value type if favorite is loaded if (!valueType) { if (dataItem && dataItem.dimensionItemType) { @@ -259,19 +259,19 @@ class ThematicDialog extends Component { columns, dataElementGroup, filters, - id, + // id, indicatorGroup, noDataColor, operand, periodType, - renderingStrategy, - startDate, - endDate, + // renderingStrategy, + // startDate, + // endDate, program, valueType, thematicMapType, systemSettings, - periodsSettings, + // periodsSettings, } = this.props console.log('🚀 ~ ThematicDialog ~ render ~ filters:', filters) console.log('🚀 ~ ThematicDialog ~ render ~ periodType:', periodType) @@ -284,8 +284,8 @@ class ThematicDialog extends Component { setNoDataColor, setOperand, setPeriods, - setPeriodType, - setRenderingStrategy, + // setPeriodType, + // setRenderingStrategy, setProgram, setValueType, } = this.props @@ -301,8 +301,8 @@ class ThematicDialog extends Component { calculationError, eventDataItemError, programIndicatorError, - periodTypeError, - periodError, + // periodTypeError, + //periodError, orgUnitsError, legendSetError, } = this.state @@ -473,10 +473,7 @@ class ThematicDialog extends Component { )} {tab === 'period' && (
)} diff --git a/yarn.lock b/yarn.lock index 47963db33..fe29bec97 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2018,10 +2018,9 @@ classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2/analytics@^26.8.4": - version "26.8.4" - resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-26.8.4.tgz#e26bb345b729f3e3b27af03d763c9a8c3de4f8ee" - integrity sha512-kQsLcLt0b9FWnzrKNF4m44CSCok7eZft6iGXvl5Kq2Oo0B/k/P3kTosSL/Hx2Oub40CbT+V6Z2bQVrgRqJ49vg== +"@dhis2/analytics@git+https://github.com/d2-ci/analytics.git#feat/DHIS2-15796": + version "26.9.2" + resolved "git+https://github.com/d2-ci/analytics.git#c3860a94bfbb927719fcef4f8eaa57a7950018b2" dependencies: "@dhis2/multi-calendar-dates" "^1.2.2" "@dnd-kit/core" "^6.0.7" @@ -2029,7 +2028,7 @@ "@dnd-kit/utilities" "^3.2.1" "@react-hook/debounce" "^4.0.0" classnames "^2.3.1" - crypto-js "^4.1.1" + crypto-js "^4.2.0" d2-utilizr "^0.2.16" d3-color "^1.2.3" highcharts "^10.3.3" @@ -6747,7 +6746,7 @@ crypto-browserify@^3.0.0: randombytes "^2.0.0" randomfill "^1.0.3" -crypto-js@^4.1.1: +crypto-js@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-4.2.0.tgz#4d931639ecdfd12ff80e8186dba6af2c2e856631" integrity sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==