Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ui framework version bump. Datepicker implementation #296

Merged
merged 2 commits into from
Oct 30, 2020
Merged

ui framework version bump. Datepicker implementation #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2020a9c
ui framework version bump. Datepicker implementation
tomaszrondio Oct 30, 2020
96c7301
Merge pull request #295 from tomaszrondio/master
tomaszrondio Oct 30, 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
9 changes: 1 addition & 8 deletions client/__tests__/components/Analytics/FiltersPanel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,18 +78,11 @@ describe("Analytics/FiltersPanel", () => {
/>
);

const input = container.querySelector('input[name="published_before"]');
fireEvent.change(input, { target: { value: "2020-02-02" } });

const filterButton = getByText("Run Report");
fireEvent.click(filterButton);

expect(setFilters).toHaveBeenCalled();

let newFilters = { ...filters };
newFilters.published_before = "2020-02-02";

expect(setFilters).toHaveBeenCalledWith(newFilters);
expect(setFilters).toHaveBeenCalledWith(filters);
});

it("clears filters", () => {
Expand Down
60 changes: 48 additions & 12 deletions client/__tests__/components/Analytics/__snapshots__/Analytics.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,12 +323,30 @@ exports[`Analytics/Analytics renders correctly 1`] = `
>
From
</label>
<input
class="sd-line-input__input"
name="published_after"
type="date"
value=""
/>
<span
class="p-calendar p-calendar-w-btn"
>
<input
autocomplete="off"
class="p-inputtext p-component p-inputtext p-component"
type="text"
value=""
/>
<button
class="p-button p-component p-datepicker-trigger p-calendar-button p-button-icon-only"
tabindex="-1"
type="button"
>
<span
class="icon-calendar p-c p-button-icon-left"
/>
<span
class="p-button-text p-c"
>
p-btn
</span>
</button>
</span>
</div>
</div>
<div
Expand All @@ -342,12 +360,30 @@ exports[`Analytics/Analytics renders correctly 1`] = `
>
To
</label>
<input
class="sd-line-input__input"
name="published_before"
type="date"
value=""
/>
<span
class="p-calendar p-calendar-w-btn"
>
<input
autocomplete="off"
class="p-inputtext p-component p-inputtext p-component"
type="text"
value=""
/>
<button
class="p-button p-component p-datepicker-trigger p-calendar-button p-button-icon-only"
tabindex="-1"
type="button"
>
<span
class="icon-calendar p-c p-button-icon-left"
/>
<span
class="p-button-text p-c"
>
p-btn
</span>
</button>
</span>
</div>
</div>
</div>
Expand Down
60 changes: 48 additions & 12 deletions client/__tests__/components/Analytics/__snapshots__/FiltersPanel.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,12 +132,30 @@ exports[`Analytics/FiltersPanel renders correctly 1`] = `
>
From
</label>
<input
class="sd-line-input__input"
name="published_after"
type="date"
value="2019-07-04"
/>
<span
class="p-calendar p-calendar-w-btn p-inputwrapper-filled"
>
<input
autocomplete="off"
class="p-inputtext p-component p-inputtext p-component p-filled"
type="text"
value="2019-07-04"
/>
<button
class="p-button p-component p-datepicker-trigger p-calendar-button p-button-icon-only"
tabindex="-1"
type="button"
>
<span
class="icon-calendar p-c p-button-icon-left"
/>
<span
class="p-button-text p-c"
>
p-btn
</span>
</button>
</span>
</div>
</div>
<div
Expand All @@ -151,12 +169,30 @@ exports[`Analytics/FiltersPanel renders correctly 1`] = `
>
To
</label>
<input
class="sd-line-input__input"
name="published_before"
type="date"
value="2019-07-04"
/>
<span
class="p-calendar p-calendar-w-btn p-inputwrapper-filled"
>
<input
autocomplete="off"
class="p-inputtext p-component p-inputtext p-component p-filled"
type="text"
value="2019-07-04"
/>
<button
class="p-button p-component p-datepicker-trigger p-calendar-button p-button-icon-only"
tabindex="-1"
type="button"
>
<span
class="icon-calendar p-c p-button-icon-left"
/>
<span
class="p-button-text p-c"
>
p-btn
</span>
</button>
</span>
</div>
</div>
</div>
Expand Down
100 changes: 75 additions & 25 deletions client/__tests__/components/ContentLists/Automatic/__snapshots__/Automatic.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,52 +134,102 @@ exports[`ContentLists/Automatic/Automatic renders properly 1`] = `
<label
class="sd-line-input__label"
>
Published date
Publish date
</label>
<input
class="sd-line-input__input"
name="published_at"
type="date"
value="2019-12-28T12:09:32+01:00"
/>
<span
class="p-calendar p-calendar-w-btn p-inputwrapper-filled"
>
<input
autocomplete="off"
class="p-inputtext p-component p-inputtext p-component p-filled"
type="text"
value="2019-12-28"
/>
<button
class="p-button p-component p-datepicker-trigger p-calendar-button p-button-icon-only"
tabindex="-1"
type="button"
>
<span
class="icon-calendar p-c p-button-icon-left"
/>
<span
class="p-button-text p-c"
>
p-btn
</span>
</button>
</span>
</div>
</div>
<div
class="form__row form__row--flex"
>
<div
class="sd-line-input sd-line-input--no-margin"
class="sd-line-input sd-line-input--no-margin form__row-item"
>
<label
class="sd-line-input__label"
>
Published after
</label>
<input
class="sd-line-input__input"
name="published_after"
type="date"
value=""
/>
<span
class="p-calendar p-calendar-w-btn"
>
<input
autocomplete="off"
class="p-inputtext p-component p-inputtext p-component"
type="text"
value=""
/>
<button
class="p-button p-component p-datepicker-trigger p-calendar-button p-button-icon-only"
tabindex="-1"
type="button"
>
<span
class="icon-calendar p-c p-button-icon-left"
/>
<span
class="p-button-text p-c"
>
p-btn
</span>
</button>
</span>
</div>
</div>
<div
class="form__row form__row--flex"
>
<div
class="sd-line-input sd-line-input--no-margin"
class="form__row-item sd-line-input sd-line-input--no-margin"
>
<label
class="sd-line-input__label"
>
Published before
</label>
<input
class="sd-line-input__input"
name="published_before"
type="date"
value=""
/>
<span
class="p-calendar p-calendar-w-btn"
>
<input
autocomplete="off"
class="p-inputtext p-component p-inputtext p-component"
type="text"
value=""
/>
<button
class="p-button p-component p-datepicker-trigger p-calendar-button p-button-icon-only"
tabindex="-1"
type="button"
>
<span
class="icon-calendar p-c p-button-icon-left"
/>
<span
class="p-button-text p-c"
>
p-btn
</span>
</button>
</span>
</div>
</div>
<div
Expand Down
Loading