Skip to content
This repository has been archived by the owner on Jun 3, 2024. It is now read-only.

PersistenceTransforms for date in datePickerRange and datePickerSingle #854

Merged
merged 23 commits into from
Sep 4, 2020
Merged

PersistenceTransforms for date in datePickerRange and datePickerSingle #854

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
d2d0f1a
add persistenceTransforms for datePickerSingle to strip time
harryturr Aug 25, 2020
4d18af3
add persistenceTransforms for datePickerRange to strip time
harryturr Aug 25, 2020
1c61fa4
circleci pointing to dash branch
harryturr Aug 25, 2020
de4647a
noise
harryturr Aug 25, 2020
cc69b07
noise
harryturr Aug 25, 2020
f4b82d1
add tests for persistence in date picker single and range
harryturr Aug 27, 2020
abc13ec
Merge branch 'dev' into hg-700-persistence
harryturr Sep 1, 2020
c66bb74
rm obsolete import
harryturr Sep 1, 2020
2745855
noise
harryturr Sep 1, 2020
24db1fe
noise
harryturr Sep 2, 2020
57e5019
use ramda isNil
harryturr Sep 3, 2020
c2668a2
simplify dps test
harryturr Sep 3, 2020
778f8ca
Merge branch 'dev' into hg-700-persistence
harryturr Sep 3, 2020
c76c973
noise
harryturr Sep 3, 2020
605594c
simplify tests for dps and dpr using dash_dcc functions
harryturr Sep 3, 2020
4ba16c8
change function names and add comment
harryturr Sep 3, 2020
cc121c6
removing comma
harryturr Sep 3, 2020
32852c0
add DatePickerPersistence for shared logic between dps and dpr
harryturr Sep 4, 2020
d80a500
noise
harryturr Sep 4, 2020
e733726
Merge branch 'dev' into hg-700-persistence
harryturr Sep 4, 2020
6df0230
remove dash branch to test against new dash dev in ci
harryturr Sep 4, 2020
c0f98b4
change transformDate prop assignment
harryturr Sep 4, 2020
0519d89
update CHANGELOG.md
harryturr Sep 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ jobs:
command: |
. venv/bin/activate && mkdir packages
# build main dash
git clone --depth 1 https://github.com/plotly/dash.git dash-main
git clone -b persistence-hg --depth 1 https://github.com/plotly/dash.git dash-main
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With plotly/dash#1376 now merged, this can be 🔪

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

6df0230

cd dash-main && pip install -e .[dev] --progress-bar off && python setup.py sdist && mv dist/* ../packages/
cd dash-renderer && npm ci && npm run build
python setup.py sdist && mv dist/* ../../packages/ && cd ../..
Expand Down
26 changes: 26 additions & 0 deletions src/components/DatePickerRange.react.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import PropTypes from 'prop-types';
import React, {Component, lazy, Suspense} from 'react';
import datePickerRange from '../utils/LazyLoader/datePickerRange';
import moment from 'moment';

const RealDatePickerRange = lazy(datePickerRange);

Expand Down Expand Up @@ -263,6 +264,31 @@ DatePickerRange.propTypes = {
persistence_type: PropTypes.oneOf(['local', 'session', 'memory']),
};

DatePickerRange.persistenceTransforms = {
end_date: {
extract: propValue => {
if (!(propValue === null || propValue === undefined)) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This check is fine but can be simplified by using https://ramdajs.com/docs/#isNil instead

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

57e5019

return moment(propValue)
.startOf('day')
.format('YYYY-MM-DD');
}
return propValue;
},
apply: storedValue => storedValue,
},
start_date: {
extract: propValue => {
if (!(propValue === null || propValue === undefined)) {
return moment(propValue)
.startOf('day')
.format('YYYY-MM-DD');
}
return propValue;
},
apply: storedValue => storedValue,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The implementation for end_date and start_date extract and apply are identical (same for DatePickerSingle date) -- DRY by defining a functions that you can share between the 3 cases

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

32852c0

},
};

DatePickerRange.defaultProps = {
calendar_orientation: 'horizontal',
is_RTL: false,
Expand Down
15 changes: 15 additions & 0 deletions src/components/DatePickerSingle.react.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import PropTypes from 'prop-types';
import React, {Component, lazy, Suspense} from 'react';
import datePickerSingle from '../utils/LazyLoader/datePickerSingle';
import moment from 'moment';

const RealDateSingleRange = lazy(datePickerSingle);

Expand Down Expand Up @@ -220,6 +221,20 @@ DatePickerSingle.propTypes = {
persistence_type: PropTypes.oneOf(['local', 'session', 'memory']),
};

DatePickerSingle.persistenceTransforms = {
date: {
extract: propValue => {
if (!(propValue === null || propValue === undefined)) {
return moment(propValue)
.startOf('day')
.format('YYYY-MM-DD');
}
return propValue;
},
apply: storedValue => storedValue,
},
};

DatePickerSingle.defaultProps = {
calendar_orientation: 'horizontal',
is_RTL: false,
Expand Down