Fix #3585 date-time and time support by MV88 · Pull Request #3651 · geosolutions-it/MapStore2

MV88 · 2019-03-27T09:07:50Z

Description

This pr add the support for date-time and time attributes.
Now you can use them in the Attribute Filter field.

When changing the operator it will reset the value
It starts with time 00:00:00 when selecting a date
updated formats for date and hours
requests are done in date UTC (the same you see in the input field)

Issues

Fix QueryPanel DateTime filter issues #3585

Please check if the PR fulfills these requirements

The commit message follows our guidelines: https://github.com/geosolutions-it/MapStore2/blob/master/CONTRIBUTING.md
Tests for the changes have been added (for bug fixes / features)
Docs have been added / updated (for bug fixes / features)

What kind of change does this PR introduce? (check one with "x", remove the others)

What is the current behavior? (You can also link to an open issue here)
date-time and time are not supported
We are not using utc date in the date picker and in the requests they are shifted to UTC
Hours are set to actual date if date only is used

What is the new behavior?
see description

Does this PR introduce a breaking change? (check one with "x", remove the other)

Yes
No

If this PR contains a breaking change, please describe the impact and migration path for existing applications: ...

Other information:
Please note that the date formats are a bit changed since it was not displaying correctly the Year,
and for the hours it was using month instead of minutes

coveralls · 2019-03-27T09:20:56Z

Coverage increased (+0.2%) to 81.208% when pulling 1292ff4 on MV88:3585_date_time into e3f4f11 on geosolutions-it:master.

offtherailz

I didn't have time to test it. I'll do it tomorrow morning. But you can start fixing namings and other things

offtherailz · 2019-03-28T17:15:53Z

web/client/components/misc/enhancers/utcDateWrapper.js

+ * @param {object} options to pass to the enhancer
+ * @param {string} options.dateType type choosed from ("date", "time", "date-time")
+ * @param {string} options.dateField date to use
+ * @param {string} options.setDateField function to use to update the date


call them props, not fields.
dateProp, setDateProp

offtherailz · 2019-03-28T17:21:26Z

web/client/components/misc/enhancers/utcDateWrapper.js

+ * instead without it will be used as 2019-03-19T23:00:00.000Z (in cql filter), but in the UI it will be used the
+ * actual timezone
+ */
+module.exports = ({dateType = "type", dateField = 'date', setDateField = 'onSetDate'} = {}) => compose(


"type" is not one of the allowed values. use datetime

dateType is where to check in the props the prop type = ('time', 'date', 'date-time')
I would call it dateTypeProp

Ah, ok. Yes, fine. That's a better name

web/client/utils/FeatureTypeUtils.js

offtherailz · 2019-03-28T17:30:57Z

web/client/utils/__tests__/LocaleUtils-test.js

+        expect(LocaleUtils.getDateFormat("hr-HR")).toBe("DD/MM/YYYY");
+        expect(LocaleUtils.getDateFormat("pt-PT")).toBe("DD/MM/YYYY");
+    });
+    it('DATE_FORMATS', () => {


This test is not useful at all.

what if you accidentally erase the it-IT date format customization. it will use the default one.
this checks the presence of the customization for the some locales. i'll update the it description

offtherailz · 2019-03-28T17:32:08Z

web/client/utils/__tests__/LocaleUtils-test.js

        expect(LocaleUtils.getLocalizedProp('fr-FR', localizedObjectProp)).toBe('title');
    });
+    it('getDateFormat', () => {
+        expect(LocaleUtils.getDateFormat()).toBe("YYYY/MM/DD");


I suppose this is a check for unknown locale. Please describe in a comment

for getting the default one

offtherailz · 2019-03-28T17:37:09Z

web/client/utils/TimeUtils.js

+ * @param {object} date
+ * @return {number} the offset in milliseconds
+*/
+const getTimezoneOffset = (date) => {


getTimezoneOffsetMillis, or can be confused with original one

offtherailz · 2019-03-28T17:37:47Z

web/client/utils/TimeUtils.js

+};
+
+/**
+ * @param {object} date to get only date parts (without time parts)


Suggested change

* @param {object} date to get only date parts (without time parts)

* @param {Date|string} date to parse

offtherailz · 2019-03-28T17:38:13Z

web/client/utils/TimeUtils.js

+
+/**
+ * @param {object} date to get only date parts (without time parts)
+ * @return {string} used to compose a UTC date


Suggested change

* @return {string} used to compose a UTC date

* @return {string} date part of the TimeStamp

offtherailz · 2019-03-28T17:43:40Z

web/client/components/data/featuregrid/filterRenderers/__tests__/DateTimeFilter-test.jsx

    });
    it('render with value', () => {
-        ReactDOM.render(<DateTimeFilter type="date" value={"2017-01-05Z"}/>, document.getElementById("container"));
+        ReactDOM.render(<DateTimeFilter type="date" value="2017-01-05T04:04:04Z"/>, document.getElementById("container"));


DateTimeFilter should be enhanced, or I'm afraid it will not work with dates or times only

you mean it should handle partial date or time?

btw it is using the utcDateWrapper enhancer

offtherailz · 2019-03-28T17:52:31Z

web/client/components/data/query/DateField.jsx

+        const enddate = this.props.fieldValue && this.props.fieldValue.endDate || null;
+
+        // needed to initialize the time parts to 00:00:00
+        const defaultCurrentDate = moment().startOf("day").toDate();


Don't know why this is here (and in date filter) if is needed to make UTCDateTimePicker work, it should be inside it (enhancer, setting, for instance moment().startOf("day").toDate() as default value.

If has another reason, please explain better.

This is needed to initialize the time part

Imagine the "date" case:
DateTimePicker component is initialized with a new Date based on that moment and it includes the time part.

then you select a date from the calendar but the time part will remain untouched.
with defaultCurrentDate it changes the time part of the initial value

notice that it does that also for date-time case (we may want to not do it for that case)
i think we can put it in the enhancer enabled by a flag or by the type

@offtherailz I'll update the enhancer with the defaultCurrentDate = moment().startOf("day").toDate(); at least for "date" format

offtherailz

Only one comment. In addition:
we are waiting for a VM to test this kind of stuff. It should be ready in the next few days.

It should be perfect if we postpone the check of the functionalities when we have that VM (so we don't have to recreate test data every time on our machines).
Now I'm not able to test this without spending a couple of hours configuring the local environment with the required data. I prefer to spend this time to make this data available for testers. @tdipisa what do you think?

offtherailz · 2019-04-18T10:16:31Z

Tested with this map.
It works 👍
Only the last comment is still pending @MV88

…3651) Fix geosolutions-it#3585 added date-time and time support (geosolutions-it#3651) * Add utc enhancer to the dateTimePicker components + tests * Fix tests for date time * tentative fix for date time tests * remove timezone test * fix timeutils test * update var names and tests * Fix date or time values used in cql filter * fix utcDateWrapper test * Fix date problem with firefox * fix failing test on firefox

Fix #3585 added date-time and time support (#3651) * Add utc enhancer to the dateTimePicker components + tests * Fix tests for date time * tentative fix for date time tests * remove timezone test * fix timeutils test * update var names and tests * Fix date or time values used in cql filter * fix utcDateWrapper test * Fix date problem with firefox * fix failing test on firefox

MV88 added 2 commits March 22, 2019 18:32

add supprot date-time and time, wip DateField date management

c64f2c1

Add utc enhancer to the dateTimePicker components + tests

a45e3f3

MV88 added bug Priority: High labels Mar 27, 2019

MV88 self-assigned this Mar 27, 2019

MV88 requested a review from offtherailz March 27, 2019 09:07

ghost added pending review review labels Mar 27, 2019

MV88 mentioned this pull request Mar 27, 2019

Fix #3585 date-time and time support (2019.01.xx) #3652

Closed

MV88 added 2 commits March 27, 2019 11:23

Fix tests for date time

47c44fe

tentative fix for date time tests

f83deb5

geosolutions-it deleted a comment Mar 27, 2019

MV88 added 2 commits March 28, 2019 14:06

remove timezone test

7e5ed5b

fix timeutils test

e34d2a7

geosolutions-it deleted a comment Mar 28, 2019

offtherailz requested changes Mar 28, 2019

View reviewed changes

update var names and tests

3bcf54e

geosolutions-it deleted a comment Apr 1, 2019

offtherailz reviewed Apr 8, 2019

View reviewed changes

geosolutions-it deleted a comment from offtherailz Apr 18, 2019

Fix date or time values used in cql filter

1a70d95

geosolutions-it deleted a comment Apr 24, 2019

MV88 added 3 commits April 24, 2019 15:25

fix utcDateWrapper test

ebe47c8

Fix date problem with firefox

21e8ca0

fix failing test on firefox

1292ff4

geosolutions-it deleted a comment Apr 24, 2019

MV88 requested a review from offtherailz April 29, 2019 10:32

tdipisa added this to the 2019.02.00 milestone Apr 29, 2019

tdipisa modified the milestones: 2019.02.00, 2019.01.01 Apr 29, 2019

offtherailz approved these changes May 2, 2019

View reviewed changes

MV88 merged commit fd1fe07 into geosolutions-it:master May 2, 2019

ghost removed pending review review labels May 2, 2019

	* @param {object} date to get only date parts (without time parts)
	* @param {Date\|string} date to parse

	* @return {string} used to compose a UTC date
	* @return {string} date part of the TimeStamp

Conversation

MV88 commented Mar 27, 2019

Description

Issues

Uh oh!

coveralls commented Mar 27, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

offtherailz left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

MV88 Apr 1, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

MV88 Apr 1, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

MV88 Apr 18, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

offtherailz left a comment

Choose a reason for hiding this comment

Uh oh!

offtherailz commented Apr 18, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

coveralls commented Mar 27, 2019 •

edited

Loading

MV88 Apr 1, 2019 •

edited

Loading

MV88 Apr 1, 2019 •

edited

Loading

MV88 Apr 18, 2019 •

edited

Loading