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.

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

[BREAK] Move Multiple Department Creation to EE & [NEW] Department Archive #27753

Merged
merged 71 commits into from
Feb 13, 2023
Merged
Changes from 1 commit
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
985b025
Move save department functionality to EE
sampaiodiego Jan 13, 2023
4e24aba
[FE] Move Departments to EE
MartinSchoeler Jan 13, 2023
ff865e3
Merge branch 'departments-to-ee' into move-save-department-ee
MartinSchoeler Jan 13, 2023
d61b219
Fix weird caching issue
MartinSchoeler Jan 13, 2023
984da48
Fix TS & Better error message
MartinSchoeler Jan 16, 2023
88c6dd5
Tests and small changes
MartinSchoeler Jan 16, 2023
085c803
Better wording
MartinSchoeler Jan 16, 2023
c9a5070
Merge branch 'develop' into move-save-department-ee
MartinSchoeler Jan 16, 2023
317bd12
Fix reviews & ee tests
MartinSchoeler Jan 16, 2023
6ea0021
Merge branch 'move-save-department-ee' of https://github.com/RocketCh…
MartinSchoeler Jan 16, 2023
df4d8e7
fix review again
MartinSchoeler Jan 16, 2023
050b0c2
Fix reviews
MartinSchoeler Jan 16, 2023
1919d18
reviews
MartinSchoeler Jan 16, 2023
49231b8
Merge branch 'develop' into move-save-department-ee
MartinSchoeler Jan 16, 2023
f89b05d
Fix wrong conditional
MartinSchoeler Jan 17, 2023
31da816
Merge branch 'move-save-department-ee' of https://github.com/RocketCh…
MartinSchoeler Jan 17, 2023
cf29e81
Merge branch 'develop' into move-save-department-ee
tassoevan Jan 18, 2023
f8f1e65
Fix tests
MartinSchoeler Jan 19, 2023
fca41f8
Lint
MartinSchoeler Jan 19, 2023
a7a1c3d
Move department tests to ee
MartinSchoeler Jan 20, 2023
6500401
Merge branch 'develop' into move-save-department-ee
MartinSchoeler Jan 20, 2023
61ad52d
Update NewDepartment.tsx
MartinSchoeler Jan 20, 2023
e8502c8
I love typescript ™
MartinSchoeler Jan 20, 2023
aa408af
Update apps/meteor/tests/data/livechat/rooms.ts
MartinSchoeler Jan 23, 2023
8a96b75
Merge branch 'develop' into move-save-department-ee
MartinSchoeler Jan 23, 2023
1ef34e9
Fix TS
MartinSchoeler Jan 26, 2023
0713f98
Merge branch 'develop' into move-save-department-ee
MartinSchoeler Jan 26, 2023
9be3049
Merge branch 'develop' into move-save-department-ee
MartinSchoeler Jan 30, 2023
40cc2d5
Merge branch 'develop' into move-save-department-ee
MartinSchoeler Jan 31, 2023
f5cab82
add jsdoc
MartinSchoeler Jan 31, 2023
235b605
Merge branch 'move-save-department-ee' of https://github.com/RocketCh…
MartinSchoeler Jan 31, 2023
8ad8a06
Remove extra skip
MartinSchoeler Jan 31, 2023
6f9c1f2
remove wrong field
MartinSchoeler Jan 31, 2023
dbdfffd
TS fixes
MartinSchoeler Jan 31, 2023
55457ec
Fix TS
MartinSchoeler Jan 31, 2023
5f783b5
Move some tests to EE for now
MartinSchoeler Feb 1, 2023
d4edfdf
Merge branch 'develop' into move-save-department-ee
MartinSchoeler Feb 1, 2023
8535bd7
Use correct image
MartinSchoeler Feb 3, 2023
56be13d
Fix reviews on test
MartinSchoeler Feb 3, 2023
e1b7494
Merge branch 'develop' into move-save-department-ee
MartinSchoeler Feb 3, 2023
dfa6298
Reviews
MartinSchoeler Feb 6, 2023
94a81ab
Review
MartinSchoeler Feb 6, 2023
0c107c2
Merge branch 'develop' into move-save-department-ee
MartinSchoeler Feb 6, 2023
dd77129
update wording
MartinSchoeler Feb 6, 2023
fafaaeb
Merge branch 'move-save-department-ee' of https://github.com/RocketCh…
MartinSchoeler Feb 6, 2023
2f5007c
Merge branch 'develop' into move-save-department-ee
MartinSchoeler Feb 7, 2023
1b6b47b
Merge branch 'develop' into move-save-department-ee
MartinSchoeler Feb 7, 2023
6ea6659
Update raw model
KevLehman Feb 7, 2023
8422b8b
Merge branch 'move-save-department-ee' of github.com:RocketChat/Rocke…
KevLehman Feb 7, 2023
d39c13d
lint
MartinSchoeler Feb 7, 2023
0d3df9a
Remove empty line
MartinSchoeler Feb 7, 2023
ce5dab8
Small wording & link changes to modal
MartinSchoeler Feb 8, 2023
27f0d33
Merge branch 'develop' into move-save-department-ee
KevLehman Feb 8, 2023
fc420e0
Merge branch 'develop' into move-save-department-ee
MartinSchoeler Feb 9, 2023
c77addb
[NEW] Department Archivation (#27966)
MartinSchoeler Feb 9, 2023
ca8a7ca
Merge branch 'develop' into move-save-department-ee
MartinSchoeler Feb 9, 2023
6d059b2
Fix typo
MartinSchoeler Feb 10, 2023
d17a769
Merge branch 'develop' into move-save-department-ee
MartinSchoeler Feb 10, 2023
fafc64c
Fix reviews & pagination
MartinSchoeler Feb 10, 2023
680ad26
Merge branch 'move-save-department-ee' of https://github.com/RocketCh…
MartinSchoeler Feb 10, 2023
38c5694
Chore: Add archived department tests (#27992)
MartinSchoeler Feb 10, 2023
b5a75a5
Improve coverage
MartinSchoeler Feb 10, 2023
0ca3edc
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into move…
tassoevan Feb 11, 2023
679c67f
Refactor minor pet peeves
tassoevan Feb 11, 2023
0282109
Refactor minor pet peeves
tassoevan Feb 11, 2023
e199349
Refactor minor pet peeves
tassoevan Feb 11, 2023
d604602
Merge branch 'develop' into move-save-department-ee
murtaza98 Feb 13, 2023
d22906e
Fix error on edit forward
MartinSchoeler Feb 13, 2023
ebbfb21
Merge branch 'move-save-department-ee' of https://github.com/RocketCh…
MartinSchoeler Feb 13, 2023
cff00b7
Fix some reviews
MartinSchoeler Feb 13, 2023
b84d8ed
Merge branch 'develop' into move-save-department-ee
kodiakhq[bot] Feb 13, 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
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,12 @@ const NewDepartment = ({ id, reload, refetchRef }: NewDepartmentProps) => {
refetchRef.current = refetch;
}, [refetchRef, refetch]);

const isMultipleDepartmentsAvailable = hasLicense || (!isLoading && data?.total !== undefined && data.total < 1);
const t = useTranslation();

if (isMultipleDepartmentsAvailable === 'loading' || undefined) {
if (isLoading || hasLicense === 'loading') {
return <PageSkeleton />;
}
if (!isMultipleDepartmentsAvailable) {
if (hasLicense === false || (data?.total !== undefined && data.total < 1)) {
MartinSchoeler marked this conversation as resolved.
Show resolved Hide resolved
return <UpgradeDepartments />;
}
// TODO: remove allowedToForwardData and data props once the EditDepartment component is migrated to TS
Expand Down