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

fix(settings): fix UI of out of office section #263

Merged
merged 14 commits into from
Jun 20, 2023
Merged

fix(settings): fix UI of out of office section #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
97d679a
fix(settings): fix UI of out of office section
beawar Jun 1, 2023
4325b2c
fix: improve types for account prefs and add tests
beawar Jun 6, 2023
3ef3bfc
fix: fix out of office time period section and remove create appointm…
beawar Jun 9, 2023
05bfd07
refactor(settings): replace external DateTimePicker with DS one
beawar Jun 9, 2023
d75e309
fix: update out-of-office dates when time period is unchecked
beawar Jun 12, 2023
fc22457
fix: set date prefs if time period is checked
beawar Jun 13, 2023
0e33490
fix(settings): search settings fix boolean usage and make discard work
beawar Jun 13, 2023
f224685
refactor: move and rename out of office and search settings
beawar Jun 13, 2023
523bac4
test: test search settings
beawar Jun 13, 2023
002fa84
build(deps): update DS dependency
CataldoMazzilli Jun 15, 2023
e7a0098
fix: increase width of dropdown for external senders to make it readable
beawar Jun 19, 2023
2915941
Merge branch 'devel' into SHELL-70-fix-out-of-office-settings-ui
CataldoMazzilli Jun 20, 2023
a440694
Merge branch 'devel' into SHELL-70-fix-out-of-office-settings-ui
beawar Jun 20, 2023
1a38faa
Merge remote-tracking branch 'origin/devel' into SHELL-70-fix-out-of-…
beawar Jun 20, 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
3 changes: 1 addition & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,10 @@
/lib/
/deploy/
/junit.xml
/coverage/cobertura-coverage.xml
/coverage/
/.vscode/
/.idea/
.dev.json
zextras-carbonio-*.tgz
shell.iml
.env
/coverage
758 changes: 434 additions & 324 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

15 changes: 3 additions & 12 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,15 @@
"@babel/preset-typescript": "^7.21.0",
"@commitlint/cli": "^17.4.3",
"@commitlint/config-conventional": "^17.4.3",
"@faker-js/faker": "^8.0.2",
"@svgr/webpack": "^6.5.1",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^12.1.5",
"@testing-library/user-event": "^14.4.3",
"@types/jest": "^29.5.0",
"@types/lodash": "^4.14.191",
"@types/react": "^17.0.53",
"@types/react-datepicker": "^4.11.2",
"@types/react-dom": "^17.0.19",
"@types/react-router-dom": "^5.3.3",
"@types/react-widgets": "^4.4.7",
Expand Down Expand Up @@ -92,31 +94,20 @@
},
"dependencies": {
"@fontsource/roboto": "^4.5.7",
"@reduxjs/toolkit": "^1.9.2",
"@sentry/browser": "^7.43.0",
"@tinymce/tinymce-react": "^4.3.0",
"@zextras/carbonio-design-system": "^2.1.0",
"@zextras/carbonio-ui-preview": "^1.1.0",
"darkreader": "^4.9.58",
"history": "^5.3.0",
"i18next": "^22.4.12",
"i18next-http-backend": "^2.2.0",
"immer": "^9.0.19",
"lodash": "^4.17.21",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-i18next": "^12.1.5",
"react-redux": "^8.0.5",
"react-router-dom": "^5.3.4",
"react-widgets": "^4.6.1",
"react-widgets-moment": "^4.0.30",
"tinymce": "^6.4.0",
"ua-parser-js": "^1.0.34",
"zustand": "^4.3.8"
},
"peerDependencies": {
"@reduxjs/toolkit": "^1 >=1.9",
"@zextras/carbonio-design-system": "^2.1.0",
"@zextras/carbonio-design-system": "^2.1.1",
"@zextras/carbonio-ui-preview": "^1",
"core-js": "^3.27.2",
"lodash": "^4.17.21",
Expand Down
3 changes: 3 additions & 0 deletions src/jest-env-setup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ beforeEach(() => {

// cleanup local storage
window.localStorage.clear();

jest.spyOn(document.documentElement, 'clientWidth', 'get').mockReturnValue(1024);
jest.spyOn(document.documentElement, 'clientHeight', 'get').mockReturnValue(768);
});

beforeAll(() => {
Expand Down
Loading