-
-
Notifications
You must be signed in to change notification settings - Fork 184
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
feat(organizations): add Organization Settings route TASK-981 #5299
Conversation
# Conflicts: # jsapp/js/account/organization/OrganizationSettingsField.tsx # jsapp/js/account/organization/organizationSettingsRoute.module.scss
…anizations-settings
plus update some comments
…anizations-settings
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, not tested, see 2 nitpicks inline.
let deletionMessage = t('To delete this ##team/org##, please contact the server administrator.') | ||
.replaceAll('##team/org##', mmoLabelLowercase); | ||
if (isStripeEnabled) { | ||
deletionMessage = t("To delete this ##team/org##, you need to cancel your current ##plan name## plan. At the end of the plan period your ##team/org##'s projects will be converted to projects owned by your personal account.") | ||
.replaceAll('##team/org##', mmoLabelLowercase) | ||
.replace('##plan name##', subscriptions.planName); | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
more of a linter thing, but don't use let
and mutation if possible. Here one way to rewrite it
let deletionMessage = t('To delete this ##team/org##, please contact the server administrator.') | |
.replaceAll('##team/org##', mmoLabelLowercase); | |
if (isStripeEnabled) { | |
deletionMessage = t("To delete this ##team/org##, you need to cancel your current ##plan name## plan. At the end of the plan period your ##team/org##'s projects will be converted to projects owned by your personal account.") | |
.replaceAll('##team/org##', mmoLabelLowercase) | |
.replace('##plan name##', subscriptions.planName); | |
} | |
const deletionMessage = isStripeEnabled | |
? t("To delete this ##team/org##, you need to cancel your current ##plan name## plan. At the end of the plan period your ##team/org##'s projects will be converted to projects owned by your personal account.") | |
.replaceAll('##team/org##', mmoLabelLowercase) | |
.replace('##plan name##', subscriptions.planName) | |
: t('To delete this ##team/org##, please contact the server administrator.') | |
.replaceAll('##team/org##', mmoLabelLowercase); |
or
const deletionMessage = t(isStripeEnabled
? "To delete this ##team/org##, you need to cancel your current ##plan name## plan. At the end of the plan period your ##team/org##'s projects will be converted to projects owned by your personal account."
: 'To delete this ##team/org##, please contact the server administrator.'
)
.replaceAll('##team/org##', mmoLabelLowercase)
.replace('##plan name##', subscriptions.planName)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
Tested and now it works like a charm! 👏🏻
📣 Summary
In Organization Settings route (
#/account/organization/settings
) display editable organization name, and website. Also display non-editable organization type.📖 Description
Only some roles allow editing the fields, and there is some logic in regards to fields being visible.
👀 Preview steps
mmosEnabled
#/account/organization/settings
Next steps:
#/account/organization/settings