Skip to content

[WC-1698]: Replace glyphicons in pluggableWidgets #504

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

Merged
merged 24 commits into from
May 23, 2023
Merged

[WC-1698]: Replace glyphicons in pluggableWidgets #504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
6839445
chore(rating-web): replace rating-web glyphicons
rahmanunver May 4, 2023
575a9b7
chore(datagrid-web): replace calendar icon
rahmanunver May 4, 2023
bb13e31
chore(pluggable-widget-commons): replace Pagination icons
rahmanunver May 4, 2023
f98f427
test(datagrid-web): update test snapshot
rahmanunver May 4, 2023
930eab0
test(rating-web): update test snapshot
rahmanunver May 4, 2023
7997612
test(pluggable-widgets-commons): update test snapshot
rahmanunver May 4, 2023
d0bba78
chore(data-widgets): bump patch and update CHANGELOG
rahmanunver May 4, 2023
b781a7c
chore(datagrid-date-filter-web): bump patch and update CHANGELOG
rahmanunver May 4, 2023
8a6d93f
chore(rating-web): bump patch and update CHANGELOG
rahmanunver May 4, 2023
f4b1a35
chore(web-widgets): re-update chagelogs after conflict
rahmanunver May 4, 2023
eb0d3d3
fix(web-widgets): fix styling of replaced icons
rahmanunver May 15, 2023
6f1fde0
test(web-widgets): update snapshot tests after icon changes
rahmanunver May 15, 2023
7dc3681
fix(pluggable-widget-commons): update classnames to provide selector …
rahmanunver May 16, 2023
f5b6ee9
fix(gallery-web): update selector in test, update snapshot
rahmanunver May 16, 2023
f3a9214
test(datagrid-web): update snapshot
rahmanunver May 16, 2023
1bc5ab7
test(datagrid-web): update e2e test screenshots
rahmanunver May 19, 2023
4233360
test(gallery-web): update e2e test screenshots
rahmanunver May 19, 2023
7af9741
test(language-selector-web): update e2e test screenshots
rahmanunver May 19, 2023
bddd694
test(datagrid-web): update e2e screenshots
rahmanunver May 19, 2023
5b8603d
test(gallery-web): update e2e screenshots again
rahmanunver May 19, 2023
ee0de96
test(datagrid-web): update datagrid e2e screenshots
rahmanunver May 19, 2023
8813bda
test: update dg2 and gallery screenshots
leonardomendix May 22, 2023
6a9b9e6
fix(datagrid-date-filter-web): bump package.xml version
leonardomendix May 23, 2023
81eb1ed
test: update datagrid date filter screenshots
leonardomendix May 23, 2023
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
4 changes: 4 additions & 0 deletions packages/modules/data-widgets/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## [Unreleased]

### Changed

- We replaced glyphicons with internal icons

## [2.7.2] DataWidgets - 2023-05-02

### [2.7.1] Datagrid
Expand Down
2 changes: 1 addition & 1 deletion packages/modules/data-widgets/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@mendix/data-widgets",
"moduleName": "Data Widgets",
"version": "2.7.2",
"version": "2.7.3",
"license": "Apache-2.0",
"copyright": "© Mendix Technology BV 2023. All rights reserved.",
"private": true,
Expand Down
4 changes: 4 additions & 0 deletions packages/modules/data-widgets/src/themesource/datawidgets/web/_datagrid-filters.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ $item-min-height: 32px;

.btn-calendar {
margin-left: 5px; //Review in atlas, the current date picker is also 5px
.button-icon {
width: 18px;
height: 18px;
}
}
}

Expand Down
7 changes: 7 additions & 0 deletions packages/modules/data-widgets/src/themesource/datawidgets/web/_datagrid.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,13 @@ $grid-selected-row-background: $brand-light;
outline: 1px solid $brand-primary;
}
}
.pagination-icon {
position: relative;
top: 4px;
display: inline-block;
width: 20px;
height: 20px;
}
}

/* Column selector for hidable columns outside DG context */
Expand Down
4 changes: 4 additions & 0 deletions packages/pluggableWidgets/datagrid-date-filter-web/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## [Unreleased]

### Changed

- We replaced glyphicons with internal icons

## [2.5.0] - 2023-05-01

### Fixed
Expand Down
Binary file modified ...sual-screenshots/baseline/DataGridDateFilter.spec-dataGridDateFilter-chrome.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...nshots/baseline/DataGridDateFilter.spec-dataGridDateFilterDatePicker-chrome.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion packages/pluggableWidgets/datagrid-date-filter-web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@mendix/datagrid-date-filter-web",
"widgetName": "DatagridDateFilter",
"version": "2.5.0",
"version": "2.5.1",
"description": "",
"copyright": "© Mendix Technology BV 2023. All rights reserved.",
"private": true,
Expand Down
12 changes: 12 additions & 0 deletions packages/pluggableWidgets/datagrid-date-filter-web/src/components/CalendarIcon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import { createElement } from "react";

export default function CalendarIcon() {
return (
<svg className="button-icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
<path
fill="currentColor"
d="M27,5h-3V3h-4v2H12V3h-4v2h-3c-.55,0-1,.45-1,1V28c0,.55,.45,1,1,1H27c.55,0,1-.45,1-1V6c0-.55-.45-1-1-1ZM12,23h-4v-2h4v2Zm0-5h-4v-2h4v2Zm6,5h-4v-2h4v2Zm0-5h-4v-2h4v2Zm6,0h-4v-2h4v2Zm0-5H8v-2H24v2Z"
/>
</svg>
);
}
3 changes: 2 additions & 1 deletion packages/pluggableWidgets/datagrid-date-filter-web/src/components/DatePicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import { isDate, isValid } from "date-fns";
import { createPortal } from "react-dom";
import replaceAllInserter from "string.prototype.replaceall";
import { doubleMonthOrDayWhenSingle } from "../utils/utils";
import CalendarIcon from "./CalendarIcon";

export type RangeDateValue = [Date | undefined, Date | undefined];

Expand Down Expand Up @@ -147,7 +148,7 @@ export const DatePicker = forwardRef(
}
}}
>
<span className="glyphicon glyphicon-calendar" />
<CalendarIcon />
</button>
</Fragment>
);
Expand Down
26 changes: 20 additions & 6 deletions ...d-date-filter-web/src/components/__tests__/__snapshots__/DatagridDateFilter.spec.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,16 @@ exports[`Date Filter with single instance with multiple attributes renders corre
aria-label="Show calendar"
class="btn btn-default btn-calendar"
>
<span
class="glyphicon glyphicon-calendar"
/>
<svg
class="button-icon"
viewBox="0 0 32 32"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M27,5h-3V3h-4v2H12V3h-4v2h-3c-.55,0-1,.45-1,1V28c0,.55,.45,1,1,1H27c.55,0,1-.45,1-1V6c0-.55-.45-1-1-1ZM12,23h-4v-2h4v2Zm0-5h-4v-2h4v2Zm6,5h-4v-2h4v2Zm0-5h-4v-2h4v2Zm6,0h-4v-2h4v2Zm0-5H8v-2H24v2Z"
fill="currentColor"
/>
</svg>
</button>
</div>
</DocumentFragment>
Expand Down Expand Up @@ -112,9 +119,16 @@ exports[`Date Filter with single instance with single attribute renders correctl
aria-label="Show calendar"
class="btn btn-default btn-calendar"
>
<span
class="glyphicon glyphicon-calendar"
/>
<svg
class="button-icon"
viewBox="0 0 32 32"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M27,5h-3V3h-4v2H12V3h-4v2h-3c-.55,0-1,.45-1,1V28c0,.55,.45,1,1,1H27c.55,0,1-.45,1-1V6c0-.55-.45-1-1-1ZM12,23h-4v-2h4v2Zm0-5h-4v-2h4v2Zm6,5h-4v-2h4v2Zm0-5h-4v-2h4v2Zm6,0h-4v-2h4v2Zm0-5H8v-2H24v2Z"
fill="currentColor"
/>
</svg>
</button>
</div>
</DocumentFragment>
Expand Down
52 changes: 40 additions & 12 deletions .../datagrid-date-filter-web/src/components/__tests__/__snapshots__/DatePicker.spec.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,16 @@ Array [
aria-label="Show calendar"
class="btn btn-default btn-calendar"
>
<span
class="glyphicon glyphicon-calendar"
/>
<svg
class="button-icon"
viewBox="0 0 32 32"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M27,5h-3V3h-4v2H12V3h-4v2h-3c-.55,0-1,.45-1,1V28c0,.55,.45,1,1,1H27c.55,0,1-.45,1-1V6c0-.55-.45-1-1-1ZM12,23h-4v-2h4v2Zm0-5h-4v-2h4v2Zm6,5h-4v-2h4v2Zm0-5h-4v-2h4v2Zm6,0h-4v-2h4v2Zm0-5H8v-2H24v2Z"
fill="currentColor"
/>
</svg>
</button>,
]
`;
Expand Down Expand Up @@ -71,9 +78,16 @@ Array [
aria-label="Show calendar"
class="btn btn-default btn-calendar"
>
<span
class="glyphicon glyphicon-calendar"
/>
<svg
class="button-icon"
viewBox="0 0 32 32"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M27,5h-3V3h-4v2H12V3h-4v2h-3c-.55,0-1,.45-1,1V28c0,.55,.45,1,1,1H27c.55,0,1-.45,1-1V6c0-.55-.45-1-1-1ZM12,23h-4v-2h4v2Zm0-5h-4v-2h4v2Zm6,5h-4v-2h4v2Zm0-5h-4v-2h4v2Zm6,0h-4v-2h4v2Zm0-5H8v-2H24v2Z"
fill="currentColor"
/>
</svg>
</button>,
]
`;
Expand Down Expand Up @@ -112,9 +126,16 @@ Array [
aria-label="my calendar"
class="btn btn-default btn-calendar"
>
<span
class="glyphicon glyphicon-calendar"
/>
<svg
class="button-icon"
viewBox="0 0 32 32"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M27,5h-3V3h-4v2H12V3h-4v2h-3c-.55,0-1,.45-1,1V28c0,.55,.45,1,1,1H27c.55,0,1-.45,1-1V6c0-.55-.45-1-1-1ZM12,23h-4v-2h4v2Zm0-5h-4v-2h4v2Zm6,5h-4v-2h4v2Zm0-5h-4v-2h4v2Zm6,0h-4v-2h4v2Zm0-5H8v-2H24v2Z"
fill="currentColor"
/>
</svg>
</button>,
]
`;
Expand Down Expand Up @@ -151,9 +172,16 @@ Array [
aria-label="Show calendar"
class="btn btn-default btn-calendar"
>
<span
class="glyphicon glyphicon-calendar"
/>
<svg
class="button-icon"
viewBox="0 0 32 32"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M27,5h-3V3h-4v2H12V3h-4v2h-3c-.55,0-1,.45-1,1V28c0,.55,.45,1,1,1H27c.55,0,1-.45,1-1V6c0-.55-.45-1-1-1ZM12,23h-4v-2h4v2Zm0-5h-4v-2h4v2Zm6,5h-4v-2h4v2Zm0-5h-4v-2h4v2Zm6,0h-4v-2h4v2Zm0-5H8v-2H24v2Z"
fill="currentColor"
/>
</svg>
</button>,
]
`;
39 changes: 30 additions & 9 deletions ...grid-date-filter-web/src/components/__tests__/__snapshots__/FilterComponent.spec.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,16 @@ exports[`Filter component renders correctly 1`] = `
aria-label="Show calendar"
class="btn btn-default btn-calendar"
>
<span
class="glyphicon glyphicon-calendar"
/>
<svg
class="button-icon"
viewBox="0 0 32 32"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M27,5h-3V3h-4v2H12V3h-4v2h-3c-.55,0-1,.45-1,1V28c0,.55,.45,1,1,1H27c.55,0,1-.45,1-1V6c0-.55-.45-1-1-1ZM12,23h-4v-2h4v2Zm0-5h-4v-2h4v2Zm6,5h-4v-2h4v2Zm0-5h-4v-2h4v2Zm6,0h-4v-2h4v2Zm0-5H8v-2H24v2Z"
fill="currentColor"
/>
</svg>
</button>
</div>
`;
Expand Down Expand Up @@ -93,9 +100,16 @@ exports[`Filter component renders correctly when not adjustable by user 1`] = `
aria-label="Show calendar"
class="btn btn-default btn-calendar"
>
<span
class="glyphicon glyphicon-calendar"
/>
<svg
class="button-icon"
viewBox="0 0 32 32"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M27,5h-3V3h-4v2H12V3h-4v2h-3c-.55,0-1,.45-1,1V28c0,.55,.45,1,1,1H27c.55,0,1-.45,1-1V6c0-.55-.45-1-1-1ZM12,23h-4v-2h4v2Zm0-5h-4v-2h4v2Zm6,5h-4v-2h4v2Zm0-5h-4v-2h4v2Zm6,0h-4v-2h4v2Zm0-5H8v-2H24v2Z"
fill="currentColor"
/>
</svg>
</button>
</div>
`;
Expand Down Expand Up @@ -154,9 +168,16 @@ exports[`Filter component renders correctly with aria labels 1`] = `
aria-label="Show calendar"
class="btn btn-default btn-calendar"
>
<span
class="glyphicon glyphicon-calendar"
/>
<svg
class="button-icon"
viewBox="0 0 32 32"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M27,5h-3V3h-4v2H12V3h-4v2h-3c-.55,0-1,.45-1,1V28c0,.55,.45,1,1,1H27c.55,0,1-.45,1-1V6c0-.55-.45-1-1-1ZM12,23h-4v-2h4v2Zm0-5h-4v-2h4v2Zm6,5h-4v-2h4v2Zm0-5h-4v-2h4v2Zm6,0h-4v-2h4v2Zm0-5H8v-2H24v2Z"
fill="currentColor"
/>
</svg>
</button>
</div>
`;
2 changes: 1 addition & 1 deletion packages/pluggableWidgets/datagrid-date-filter-web/src/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<package xmlns="http://www.mendix.com/package/1.0/">
<clientModule name="DatagridDateFilter" version="2.5.0" xmlns="http://www.mendix.com/clientModule/1.0/">
<clientModule name="DatagridDateFilter" version="2.5.1" xmlns="http://www.mendix.com/clientModule/1.0/">
<widgetFiles>
<widgetFile path="DatagridDateFilter.xml" />
</widgetFiles>
Expand Down
4 changes: 4 additions & 0 deletions packages/pluggableWidgets/datagrid-web/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## [Unreleased]

### Changed

- We replaced glyphicons with internal icons

## [2.7.1] - 2023-05-02

### Added
Expand Down
Binary file modified ...ress-visual-screenshots/baseline/DataGrid.spec-dataGridColumnContent-chrome.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...ess-visual-screenshots/baseline/DataGrid.spec-dataGridColumnContent-firefox.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...agrid-web/cypress-visual-screenshots/baseline/DataGrid.spec-datagrid-chrome.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...grid-web/cypress-visual-screenshots/baseline/DataGrid.spec-datagrid-firefox.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...sual-screenshots/baseline/DataGridFilteringIntegration.spec-datagrid-chrome.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...ual-screenshots/baseline/DataGridFilteringIntegration.spec-datagrid-firefox.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...ss-visual-screenshots/baseline/DataGridFilteringSingle.spec-datagrid-chrome.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...s-visual-screenshots/baseline/DataGridFilteringSingle.spec-datagrid-firefox.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...shots/baseline/DataGridSelection.spec-datagridMultiSelectionCheckbox-chrome.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...shots/baseline/DataGridSelection.spec-datagridMultiSelectionRowClick-chrome.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...hots/baseline/DataGridSelection.spec-datagridSingleSelectionCheckbox-chrome.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...hots/baseline/DataGridSelection.spec-datagridSingleSelectionRowClick-chrome.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion packages/pluggableWidgets/datagrid-web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@mendix/datagrid-web",
"widgetName": "Datagrid",
"version": "2.7.1",
"version": "2.7.2",
"description": "",
"copyright": "© Mendix Technology BV 2023. All rights reserved.",
"private": true,
Expand Down
Loading