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

Add info/warning messages for organization discovery #4466

Merged
merged 3 commits into from
Nov 1, 2023
Merged

Add info/warning messages for organization discovery #4466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dc8e7b1
Add info/warning messages for organization discovery
Rashmini Oct 31, 2023
8b16dd9
Change message to oxygen UI component
Rashmini Nov 1, 2023
eec164e
Add changeset
Rashmini Nov 1, 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
6 changes: 6 additions & 0 deletions .changeset/rich-pugs-enjoy.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@wso2is/console": patch
"@wso2is/i18n": patch
---

Add info/warning messages for organization discovery
6 changes: 6 additions & 0 deletions ...le/src/features/organization-discovery/components/edit-organization-discovery-domains.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
* under the License.
*/

import Alert from "@oxygen-ui/react/Alert";
import Autocomplete, {
AutocompleteRenderGetTagProps,
AutocompleteRenderInputParams
Expand All @@ -37,6 +38,7 @@ import React, { FunctionComponent, ReactElement, SyntheticEvent, useEffect, useS
import { useTranslation } from "react-i18next";
import { useDispatch, useSelector } from "react-redux";
import { Dispatch } from "redux";
import { Divider } from "semantic-ui-react";
import { AppState, FeatureConfigInterface } from "../../core";
import updateOrganizationDiscoveryAttributes from "../api/update-organization-email-domains";
import {
Expand Down Expand Up @@ -185,6 +187,10 @@ const EditOrganizationDiscoveryDomains: FunctionComponent<EditOrganizationDiscov

return (
<EmphasizedSegment padded="very" key={ organization?.id }>
<Alert severity="warning">
{ t("console:manage.features.organizationDiscovery.edit.form.message") }
</Alert>
<Divider hidden />
<FinalForm
initialValues={ {
organizationName: organization.name
Expand Down
5 changes: 5 additions & 0 deletions ...console/src/features/organization-discovery/pages/organization-discovery-domains-page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
* under the License.
*/

import Alert from "@oxygen-ui/react/Alert";
import { AccessControlConstants, Show } from "@wso2is/access-control";
import { AlertLevels, IdentifiableComponentInterface } from "@wso2is/core/models";
import { addAlert } from "@wso2is/core/store";
Expand Down Expand Up @@ -362,6 +363,10 @@ const OrganizationDiscoveryDomainsPage: FunctionComponent<OrganizationDiscoveryD
>
{ discoveryToggle() }
<Divider hidden />
<Alert severity="info">
{ t("console:manage.features.organizationDiscovery.message") }
</Alert>
<Divider hidden />
{ isOrganizationDiscoveryEnabled && (
<ListLayout
advancedSearch={ (
Expand Down
2 changes: 2 additions & 0 deletions modules/i18n/src/models/namespaces/console-ns.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3346,8 +3346,10 @@ export interface ConsoleNS {
hint: string;
};
};
message: string;
};
};
message: string;
notifications: {
addEmailDomains: {
error: {
Expand Down
11 changes: 7 additions & 4 deletions modules/i18n/src/translations/en-US/portals/console.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9487,7 +9487,7 @@ export const console: ConsoleNS = {
emailDomains: {
label : "Email Domains",
placeholder: "Enter email domains",
hint: "Enter the email domains you wish to map to the organization. Separate multiple domains by hitting enter and typing the next domain."
hint: "Type and enter to add email domains which should be mapped to the organization. (E.g. gmail.com etc.)"
},
organizationName: {
label: "Organization Name",
Expand Down Expand Up @@ -9515,15 +9515,18 @@ export const console: ConsoleNS = {
emailDomains: {
label : "Email Domains",
placeholder: "Enter email domains",
hint: "Enter the email domains you wish to map to the organization. Separate multiple domains by hitting enter and typing the next domain."
hint: "Type and enter to add email domains which should be mapped to the organization. (E.g. gmail.com etc.)."
},
organizationName: {
label: "Organization Name",
hint: "The name of the organization to which the domain mapping are added."
hint: "The name of the organization to which the domain mappings are added."
}
}
},
message: "If you change the email domain mappings, users who are already registered in your organization might " +
"not be able to log in. Therefore, please be conscious when you update the email domains."
}
},
message: "Email domain discovery feature can only be used when email address is configured as the username.",
notifications: {
addEmailDomains: {
error: {
Expand Down
9 changes: 6 additions & 3 deletions modules/i18n/src/translations/fr-FR/portals/console.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7707,7 +7707,7 @@ export const console: ConsoleNS = {
emailDomains: {
label : "Domaines de messagerie",
placeholder: "Entrez les domaines de messagerie",
hint: "Entrez les domaines de messagerie que vous souhaitez mapper à l'organisation.Séparez plusieurs domaines en appuyant sur Entrée et en tapant le domaine suivant."
hint: "Tapez et entrez pour ajouter des domaines de messagerie qui doivent être mappés à l'organisation. (Par exemple, gmail.com, etc.)"
},
organizationName: {
label: "nom de l'organisation",
Expand Down Expand Up @@ -7735,15 +7735,18 @@ export const console: ConsoleNS = {
emailDomains: {
label : "Domaines de messagerie",
placeholder: "Entrez les domaines de messagerie",
hint: "Entrez les domaines de messagerie que vous souhaitez mapper à l'organisation.Séparez plusieurs domaines en appuyant sur Entrée et en tapant le domaine suivant."
hint: "Tapez et entrez pour ajouter des domaines de messagerie qui doivent être mappés à l'organisation. (Par exemple, gmail.com, etc.)"
},
organizationName: {
label: "nom de l'organisation",
hint: "Entrez le nom de l'organisation que vous souhaitez ajouter la cartographie du domaine."
}
}
},
message: "Si vous modifiez les mappages de domaines de messagerie, les utilisateurs déjà enregistrés dans votre organisation risquent de ne " +
"pas pouvoir se connecter. Par conséquent, soyez prudent lorsque vous mettez à jour les domaines de messagerie."
}
},
message: "La fonctionnalité de découverte de domaine de messagerie ne peut être utilisée que lorsque l'adresse e-mail est configurée comme nom d'utilisateur.",
notifications: {
addEmailDomains: {
error: {
Expand Down
9 changes: 6 additions & 3 deletions modules/i18n/src/translations/si-LK/portals/console.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7538,7 +7538,7 @@ export const console: ConsoleNS = {
emailDomains: {
label : "ඊමේල් වසම්",
placeholder: "විද්යුත් තැපැල් වසම් ඇතුළත් කරන්න",
hint: "ඔබට සංවිධානයට සිතියම සිතියම් ගත කිරීමට කැමති ඊමේල් වසම් ඇතුළත් කරන්න.Enter සහ ඊළඟ වසම ටයිප් කිරීමෙන් බහුවිධ වසම් වෙන් කරන්න."
hint: "සංවිධානයට සිතියම්ගත කළ යුතු ඊමේල් වසම් එක් කිරීමට ටයිප් කර ඇතුල් කරන්න. (උදා. gmail.com ආදිය)"
},
organizationName: {
label: "සංවිධානයේ නම",
Expand Down Expand Up @@ -7566,15 +7566,18 @@ export const console: ConsoleNS = {
emailDomains: {
label : "ඊමේල් වසම්",
placeholder: "විද්යුත් තැපැල් වසම් ඇතුළත් කරන්න",
hint: "ඔබට සංවිධානයට සිතියම සිතියම් ගත කිරීමට කැමති ඊමේල් වසම් ඇතුළත් කරන්න.Enter සහ ඊළඟ වසම ටයිප් කිරීමෙන් බහුවිධ වසම් වෙන් කරන්න."
hint: "සංවිධානයට සිතියම්ගත කළ යුතු ඊමේල් වසම් එක් කිරීමට ටයිප් කර ඇතුල් කරන්න. (උදා. gmail.com ආදිය)"
},
organizationName: {
label: "සංවිධානයේ නම",
hint: "වසම් සිතියම්කරණය එක් කිරීමට ඔබ කැමති සංවිධානයේ නම ඇතුළත් කරන්න."
}
}
},
message: "ඔබ විද්‍යුත් තැපැල් වසම් සිතියම්ගත කිරීම් වෙනස් කරන්නේ නම්, ඔබේ සංවිධානයේ දැනටමත් ලියාපදිංචි වී ඇති " +
"පරිශීලකයින්ට ලොග් වීමට නොහැකි වනු ඇත. එබැවින්, ඔබ විද්‍යුත් තැපැල් වසම් යාවත්කාලීන කරන විට කරුණාකර දැනුවත් වන්න."
}
},
message: "ඊමේල් වසම් සොයාගැනීමේ විශේෂාංගය භාවිත කළ හැක්කේ ඊමේල් ලිපිනය පරිශීලක නාමය ලෙස වින්‍යාස කර ඇති විට පමණි.",
notifications: {
addEmailDomains: {
error: {
Expand Down
Loading