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

Regression: bump onboarding-ui version #25320

Merged
merged 2 commits into from
Apr 29, 2022
Merged

Regression: bump onboarding-ui version #25320

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
832f398
fix: bump onboarding-ui version
guijun13 Apr 26, 2022
da3f651
fix: update adminData types
guijun13 Apr 26, 2022
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
2 changes: 1 addition & 1 deletion apps/meteor/client/views/setupWizard/contexts/SetupWizardContext.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ type SetupWizarContextValue = {

export const SetupWizardContext = createContext<SetupWizarContextValue>({
setupWizardData: {
adminData: { fullname: '', username: '', companyEmail: '', password: '' },
adminData: { fullname: '', username: '', email: '', password: '' },
organizationData: {
organizationName: '',
organizationType: '',
Expand Down
10 changes: 5 additions & 5 deletions apps/meteor/client/views/setupWizard/providers/SetupWizardProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { useParameters } from '../hooks/useParameters';
import { useStepRouting } from '../hooks/useStepRouting';

const initialData: ContextType<typeof SetupWizardContext>['setupWizardData'] = {
adminData: { fullname: '', username: '', companyEmail: '', password: '' },
adminData: { fullname: '', username: '', email: '', password: '' },
organizationData: {
organizationName: '',
organizationType: '',
Expand Down Expand Up @@ -69,13 +69,13 @@ const SetupWizardProvider = ({ children }: { children: ReactElement }): ReactEle

const registerAdminUser = useCallback(async (): Promise<void> => {
const {
adminData: { fullname, username, companyEmail, password },
adminData: { fullname, username, email, password },
} = setupWizardData;
await registerUser({ name: fullname, username, email: companyEmail, pass: password });
await registerUser({ name: fullname, username, email, pass: password });
callbacks.run('userRegistered', {});

try {
await loginWithPassword(companyEmail, password);
await loginWithPassword(email, password);
} catch (error) {
if (error instanceof Meteor.Error && error.error === 'error-invalid-email') {
dispatchToastMessage({ type: 'success', message: t('We_have_sent_registration_email') });
Expand All @@ -90,7 +90,7 @@ const SetupWizardProvider = ({ children }: { children: ReactElement }): ReactEle
setForceLogin(false);

await defineUsername(username);
await dispatchSettings([{ _id: 'Organization_Email', value: companyEmail }]);
await dispatchSettings([{ _id: 'Organization_Email', value: email }]);
callbacks.run('usernameSet', {});
}, [defineUsername, dispatchToastMessage, loginWithPassword, registerUser, setForceLogin, dispatchSettings, setupWizardData, t]);

Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/client/views/setupWizard/steps/RegisterServerStep.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ const RegisterServerStep = (): ReactElement => {
stepCount={maxSteps}
onSubmit={handleRegister}
currentStep={currentStep}
initialValues={{ email: adminData.companyEmail }}
initialValues={{ email: adminData.email }}
/>
);
};
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@
"@rocket.chat/memo": "~0.31.10",
"@rocket.chat/message-parser": "~0.31.10",
"@rocket.chat/mp3-encoder": "^0.24.0",
"@rocket.chat/onboarding-ui": "~0.31.10",
"@rocket.chat/onboarding-ui": "next",
"@rocket.chat/rest-typings": "workspace:^",
"@rocket.chat/string-helpers": "~0.31.10",
"@rocket.chat/ui-kit": "~0.31.10",
Expand Down
137 changes: 125 additions & 12 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3440,6 +3440,19 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/css-in-js@npm:~0.31.11-dev.1":
version: 0.31.11-dev.1
resolution: "@rocket.chat/css-in-js@npm:0.31.11-dev.1"
dependencies:
"@emotion/hash": ^0.8.0
"@rocket.chat/css-supports": ~0.31.11-dev.1
"@rocket.chat/memo": ~0.31.11-dev.1
"@rocket.chat/stylis-logical-props-middleware": ~0.31.11-dev.1
stylis: ~4.0.13
checksum: 1535a240f01b4433bfc7428ec094b4d82ca901d5775ecc3e07a7cdc3d61fe605b4f369729fd83a8d103bfcb21e07bf7e55404e37fad650ea2cb100ecdec7038e
languageName: node
linkType: hard

"@rocket.chat/css-supports@npm:^0.31.10":
version: 0.31.10
resolution: "@rocket.chat/css-supports@npm:0.31.10"
Expand All @@ -3449,6 +3462,15 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/css-supports@npm:~0.31.11-dev.1":
version: 0.31.11-dev.1
resolution: "@rocket.chat/css-supports@npm:0.31.11-dev.1"
dependencies:
"@rocket.chat/memo": ~0.31.11-dev.1
checksum: 2bda5dda225bf8cf8e35ed473c3750c871a97c6c99797261f9b13bcf3d22c0f578c847b11688f0b8dabc146671066eaa698cde004e156586586fbc175b001650
languageName: node
linkType: hard

"@rocket.chat/emitter@npm:~0.31.10":
version: 0.31.10
resolution: "@rocket.chat/emitter@npm:0.31.10"
Expand Down Expand Up @@ -3494,6 +3516,19 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/fuselage-hooks@npm:~0.31.11-dev.1":
version: 0.31.11-dev.1
resolution: "@rocket.chat/fuselage-hooks@npm:0.31.11-dev.1"
dependencies:
"@testing-library/user-event": ^13.5.0
peerDependencies:
"@rocket.chat/fuselage-tokens": "*"
react: ^17.0.2
use-subscription: ^1.5.1
checksum: 7251296bcc32e9cbe7b0f9c32034f2a83dc514e9dab61a4f4e1892f861b65a05a46953f53fb3b5697f4fdd5c22db9fac2700d2f992a71f24e8b46271ac8fc568
languageName: node
linkType: hard

"@rocket.chat/fuselage-polyfills@npm:~0.31.10":
version: 0.31.10
resolution: "@rocket.chat/fuselage-polyfills@npm:0.31.10"
Expand All @@ -3515,6 +3550,13 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/fuselage-tokens@npm:~0.31.11-dev.1":
version: 0.31.11-dev.1
resolution: "@rocket.chat/fuselage-tokens@npm:0.31.11-dev.1"
checksum: 09a3fa246a3ab897c82bff036d2694cd09d74b0a90e6e16a86f66ec8949f6aae735c15ccfa1bfc74a7e59bcdb7e2115b50ff4040940475170955fbef854e87c2
languageName: node
linkType: hard

"@rocket.chat/fuselage-ui-kit@npm:~0.31.10":
version: 0.31.10
resolution: "@rocket.chat/fuselage-ui-kit@npm:0.31.10"
Expand Down Expand Up @@ -3554,20 +3596,48 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/fuselage@npm:~0.32.0-dev.22":
version: 0.32.0-dev.22
resolution: "@rocket.chat/fuselage@npm:0.32.0-dev.22"
dependencies:
"@rocket.chat/css-in-js": ~0.31.11-dev.1
"@rocket.chat/css-supports": ~0.31.11-dev.1
"@rocket.chat/fuselage-tokens": ~0.31.11-dev.1
"@rocket.chat/memo": ~0.31.11-dev.1
invariant: ^2.2.4
react-keyed-flatten-children: ^1.3.0
peerDependencies:
"@rocket.chat/fuselage-hooks": "*"
"@rocket.chat/fuselage-polyfills": "*"
"@rocket.chat/icons": "*"
react: ^17.0.2
react-dom: ^17.0.2
react-virtuoso: 1.2.4
checksum: eea86dce12a8e17e244ce03bec61ec4450fc8bdcd58d2f2d20b58149e7c4489215931e80297e1cafebe949428ac78702ce6a448dddd5d4d4a30532bad01ebb9d
languageName: node
linkType: hard

"@rocket.chat/icons@npm:^0.31.0, @rocket.chat/icons@npm:^0.31.9":
version: 0.31.9
resolution: "@rocket.chat/icons@npm:0.31.9"
checksum: 6238ed8a85115e7f8f64b94d1b293d44a93cd14f1b0ac4d696a6126367dcdbb99d4dd78d222f1873959cd2e4b39a6cddcd20701e9ffee0ace9f001fc5c66e1dd
languageName: node
linkType: hard

"@rocket.chat/icons@npm:^0.31.10, @rocket.chat/icons@npm:~0.31.10":
"@rocket.chat/icons@npm:~0.31.10":
version: 0.31.10
resolution: "@rocket.chat/icons@npm:0.31.10"
checksum: eb3d412fac4f3bee0971c5073017530b89e5ee583b7173c42e31cc4220ac5fc7a397709f1fda9e1b91cc73b993dab9eb45b69618e729e62135c333287c1ca6a0
languageName: node
linkType: hard

"@rocket.chat/icons@npm:~0.32.0-dev.4":
version: 0.32.0-dev.4
resolution: "@rocket.chat/icons@npm:0.32.0-dev.4"
checksum: 6160dcf4caf21f8621c2cc91a170b4913f4dbbcb9a585578777cf2b6a0eae5a0caa85ef470542ba7c1402aecf64b7d6780b6284a11f8c468ffeb2270bf64c2d1
languageName: node
linkType: hard

"@rocket.chat/livechat@npm:1.13.3":
version: 1.13.3
resolution: "@rocket.chat/livechat@npm:1.13.3"
Expand All @@ -3594,7 +3664,7 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/logo@npm:^0.31.10, @rocket.chat/logo@npm:~0.31.10":
"@rocket.chat/logo@npm:~0.31.10":
version: 0.31.10
resolution: "@rocket.chat/logo@npm:0.31.10"
dependencies:
Expand All @@ -3608,13 +3678,34 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/logo@npm:~0.31.11-dev.1":
version: 0.31.11-dev.1
resolution: "@rocket.chat/logo@npm:0.31.11-dev.1"
dependencies:
"@rocket.chat/fuselage-hooks": ~0.31.11-dev.1
"@rocket.chat/styled": ~0.31.11-dev.1
tslib: ^2.3.1
peerDependencies:
react: 17.0.2
react-dom: 17.0.2
checksum: 2744fcc3cd8c6d04a406ba2abac4231c45b67abea0b703699869a32200a9778c8da02b02e618fcd74b184eb6e15357aa0c2a55a5fafee68b3e76f4587093c554
languageName: node
linkType: hard

"@rocket.chat/memo@npm:^0.31.10, @rocket.chat/memo@npm:~0.31.10":
version: 0.31.10
resolution: "@rocket.chat/memo@npm:0.31.10"
checksum: 24c46883d34e84ec5f8bac54be4eab3a830223ee88cffb7a6b2fb32f23218f6551b215311d2e8989b841ee4d4cf746649508f37d91e7a01926bca8a3ffbac6f9
languageName: node
linkType: hard

"@rocket.chat/memo@npm:~0.31.11-dev.1":
version: 0.31.11-dev.1
resolution: "@rocket.chat/memo@npm:0.31.11-dev.1"
checksum: c85ad1df5adad84e3aa22fe591b1b267ca65f8a8d844e7b2353b273a73df06284bb366b3f506ad5abf30c2b10c3d3347801791887f06c1f950a4d5bc142d0366
languageName: node
linkType: hard

"@rocket.chat/message-parser@npm:^0.31.6, @rocket.chat/message-parser@npm:~0.31.9":
version: 0.31.9
resolution: "@rocket.chat/message-parser@npm:0.31.9"
Expand Down Expand Up @@ -3665,7 +3756,7 @@ __metadata:
"@rocket.chat/memo": ~0.31.10
"@rocket.chat/message-parser": ~0.31.10
"@rocket.chat/mp3-encoder": ^0.24.0
"@rocket.chat/onboarding-ui": ~0.31.10
"@rocket.chat/onboarding-ui": next
"@rocket.chat/rest-typings": "workspace:^"
"@rocket.chat/string-helpers": ~0.31.10
"@rocket.chat/ui-kit": ~0.31.10
Expand Down Expand Up @@ -3931,15 +4022,15 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/onboarding-ui@npm:~0.31.10":
version: 0.31.10
resolution: "@rocket.chat/onboarding-ui@npm:0.31.10"
"@rocket.chat/onboarding-ui@npm:next":
version: 0.32.0-dev.22
resolution: "@rocket.chat/onboarding-ui@npm:0.32.0-dev.22"
dependencies:
"@rocket.chat/fuselage": ^0.31.10
"@rocket.chat/fuselage-hooks": ^0.31.10
"@rocket.chat/icons": ^0.31.10
"@rocket.chat/logo": ^0.31.10
"@rocket.chat/styled": ^0.31.10
"@rocket.chat/fuselage": ~0.32.0-dev.22
"@rocket.chat/fuselage-hooks": ~0.31.11-dev.1
"@rocket.chat/icons": ~0.32.0-dev.4
"@rocket.chat/logo": ~0.31.11-dev.1
"@rocket.chat/styled": ~0.31.11-dev.1
i18next: ~21.6.11
react-hook-form: ~7.27.0
tslib: ~2.3.1
Expand All @@ -3948,7 +4039,7 @@ __metadata:
react: 17.0.2
react-dom: 17.0.2
react-i18next: ~11.15.4
checksum: b3e3bd6dbe25e590614af00e53127e6a2e1ed616054857319d52fbd1cf5a4adbaa6e0ce6c5b078602f249e2cae210c82e1c9a746280d7c4adc08ceaf229c3a31
checksum: c287d7c857dc10f1b231c709ca600102dcfaa4a19e1125d2151e0f9dfecbba6586fb31214af998a3b2a946fb0d67be5a3c1a93c132104645d3503223cfea879b
languageName: node
linkType: hard

Expand Down Expand Up @@ -4012,6 +4103,16 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/styled@npm:~0.31.11-dev.1":
version: 0.31.11-dev.1
resolution: "@rocket.chat/styled@npm:0.31.11-dev.1"
dependencies:
"@rocket.chat/css-in-js": ~0.31.11-dev.1
tslib: ^2.3.1
checksum: 44d8f501d6ecd47987e60004f789a194d470d3125aed65b9fd2d69d66c2577548545a593954ad136444ad71f9082f7e59b6d81437d89db56c3ac82f6c4dcb7f8
languageName: node
linkType: hard

"@rocket.chat/stylis-logical-props-middleware@npm:^0.31.10":
version: 0.31.10
resolution: "@rocket.chat/stylis-logical-props-middleware@npm:0.31.10"
Expand All @@ -4024,6 +4125,18 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/stylis-logical-props-middleware@npm:~0.31.11-dev.1":
version: 0.31.11-dev.1
resolution: "@rocket.chat/stylis-logical-props-middleware@npm:0.31.11-dev.1"
dependencies:
"@rocket.chat/css-supports": ~0.31.11-dev.1
tslib: ^2.3.1
peerDependencies:
stylis: 4.0.10
checksum: 6859ceedd0942261d6727759cfb0e1e98823423fa305f0bbcdc1d2196c83932ce48cc3a34c098e2f881d09f850eb4db7bfd5f4ef53ea6557ab5db7027f677a84
languageName: node
linkType: hard

"@rocket.chat/ui-kit@npm:^0.14.1":
version: 0.14.1
resolution: "@rocket.chat/ui-kit@npm:0.14.1"
Expand Down