diff --git a/src/assets/images/icons/Organisation.svg b/src/assets/images/icons/Organization.svg similarity index 100% rename from src/assets/images/icons/Organisation.svg rename to src/assets/images/icons/Organization.svg diff --git a/src/components/floweditor/FlowEditor.test.tsx b/src/components/floweditor/FlowEditor.test.tsx index 8f3d5e1db..85b033c11 100644 --- a/src/components/floweditor/FlowEditor.test.tsx +++ b/src/components/floweditor/FlowEditor.test.tsx @@ -9,7 +9,7 @@ import { getActiveFlow, getInactiveFlow, getFlowWithoutKeyword, - getOrganisationServicesQuery, + getOrganizationServicesQuery, publishFlow, getFreeFlow, resetFlowCount, @@ -46,7 +46,7 @@ const mocks = [ simulatorSearchQuery, simulatorSearchQuery, publishFlow, - getOrganisationServicesQuery, + getOrganizationServicesQuery, getFreeFlow, getFreeFlow, ]; diff --git a/src/containers/Auth/ConfirmOTP/ConfirmOTP.tsx b/src/containers/Auth/ConfirmOTP/ConfirmOTP.tsx index 77f1379c1..82cdf9652 100644 --- a/src/containers/Auth/ConfirmOTP/ConfirmOTP.tsx +++ b/src/containers/Auth/ConfirmOTP/ConfirmOTP.tsx @@ -18,7 +18,7 @@ import { User } from '../Registration/Registration'; // let's define registration success message const successMessage = (
- Your account is registered successfully. Please contact your organisation admin for the + Your account is registered successfully. Please contact your organization admin for the approval. Click here for login.
); diff --git a/src/containers/Auth/Login/Login.tsx b/src/containers/Auth/Login/Login.tsx index 788ec5ba3..d0f8c3a50 100644 --- a/src/containers/Auth/Login/Login.tsx +++ b/src/containers/Auth/Login/Login.tsx @@ -22,7 +22,7 @@ import setLogs from 'config/logs'; import { GET_ORGANIZATION_SERVICES } from 'graphql/queries/Organization'; import { Auth } from '../Auth'; -const notApprovedMsg = 'Your account is not approved yet. Please contact your organisation admin.'; +const notApprovedMsg = 'Your account is not approved yet. Please contact your organization admin.'; export const Login = () => { const { setAuthenticated } = useContext(SessionContext); diff --git a/src/containers/OrganizationList/OrganizationList.tsx b/src/containers/OrganizationList/OrganizationList.tsx index 326c59004..0ab39683a 100644 --- a/src/containers/OrganizationList/OrganizationList.tsx +++ b/src/containers/OrganizationList/OrganizationList.tsx @@ -10,7 +10,7 @@ import { DELETE_INACTIVE_ORGANIZATIONS, UPDATE_ORGANIZATION_STATUS, } from 'graphql/mutations/Organization'; -import OrganisationIcon from 'assets/images/icons/Organisation.svg?react'; +import OrganizationIcon from 'assets/images/icons/Organization.svg?react'; import ExtensionIcon from 'assets/images/icons/extension.svg?react'; import CustomerDetailsIcon from 'assets/images/icons/customer_details.svg?react'; import { setNotification } from 'common/notification'; @@ -106,7 +106,7 @@ export const OrganizationList = ({ columnStyles, }; - const listIcon = ; + const listIcon = ; const extensionIcon = ; const customerDetailsIcon = ; diff --git a/src/containers/SettingList/Organisation/Organisation.test.tsx b/src/containers/SettingList/Organization/Organisation.test.tsx similarity index 88% rename from src/containers/SettingList/Organisation/Organisation.test.tsx rename to src/containers/SettingList/Organization/Organisation.test.tsx index aa722a05a..ddd5d0839 100644 --- a/src/containers/SettingList/Organisation/Organisation.test.tsx +++ b/src/containers/SettingList/Organization/Organisation.test.tsx @@ -3,15 +3,15 @@ import UserEvent from '@testing-library/user-event'; import { MockedProvider } from '@apollo/client/testing'; import { BrowserRouter as Router, MemoryRouter } from 'react-router-dom'; -import { ORGANISATION_MOCKS } from '../SettingList.test.helper'; -import { Organisation } from './Organisation'; +import { ORGANIZATION_MOCKS } from '../SettingList.test.helper'; +import { Organization } from './Organization'; -const mocks = ORGANISATION_MOCKS; +const mocks = ORGANIZATION_MOCKS; const wrapper = ( - + ); @@ -22,10 +22,10 @@ test('it should render the placeholders correctly', async () => { expect(getByText('Loading...')).toBeInTheDocument(); await waitFor(() => { - expect(getByTestId('formLayout')).toHaveTextContent('Organisation name'); + expect(getByTestId('formLayout')).toHaveTextContent('Organization name'); expect(getByTestId('formLayout')).toHaveTextContent('Supported languages'); expect(getByTestId('formLayout')).toHaveTextContent('Default language'); - expect(getByTestId('formLayout')).toHaveTextContent('Organisation phone number'); + expect(getByTestId('formLayout')).toHaveTextContent('Organization phone number'); expect(getByTestId('formLayout')).toHaveTextContent('Low balance threshold for warning emails'); expect(getByTestId('formLayout')).toHaveTextContent( 'Critical balance threshold for warning emails' @@ -40,7 +40,7 @@ test('it renders component properly', async () => { expect(getByText('Loading...')).toBeInTheDocument(); await waitFor(() => { expect(getByText('Back to settings')).toBeInTheDocument(); - expect(getByTestId('add-container')).toHaveTextContent('Organisation name'); + expect(getByTestId('add-container')).toHaveTextContent('Organization name'); }); }); @@ -58,9 +58,9 @@ test('it renders component and clicks cancel', async () => { test('it renders component in edit mode', async () => { const { getByText, getByTestId } = render( - + - + ); diff --git a/src/containers/SettingList/Organisation/Organisation.module.css b/src/containers/SettingList/Organization/Organization.module.css similarity index 100% rename from src/containers/SettingList/Organisation/Organisation.module.css rename to src/containers/SettingList/Organization/Organization.module.css diff --git a/src/containers/SettingList/Organisation/Organisation.tsx b/src/containers/SettingList/Organization/Organization.tsx similarity index 96% rename from src/containers/SettingList/Organisation/Organisation.tsx rename to src/containers/SettingList/Organization/Organization.tsx index 445d2a604..4ff1cb059 100644 --- a/src/containers/SettingList/Organisation/Organisation.tsx +++ b/src/containers/SettingList/Organization/Organization.tsx @@ -18,7 +18,7 @@ import { GET_LANGUAGES } from 'graphql/queries/List'; import Settingicon from 'assets/images/icons/Settings/Settings.svg?react'; import CopyIcon from 'assets/images/icons/Settings/Copy.svg?react'; import { copyToClipboard } from 'common/utils'; -import styles from './Organisation.module.css'; +import styles from './Organization.module.css'; import { Checkbox } from 'components/UI/Form/Checkbox/Checkbox'; const SettingIcon = ; @@ -30,7 +30,7 @@ const queries = { deleteItemQuery: DELETE_ORGANIZATION, }; -export const Organisation = () => { +export const Organization = () => { const client = useApolloClient(); const [name, setName] = useState(''); const [organizationId, setOrganizationId] = useState(null); @@ -131,7 +131,7 @@ export const Organisation = () => { }; const validation = { - name: Yup.string().required(t('Organisation name is required.')), + name: Yup.string().required(t('Organization name is required.')), activeLanguages: Yup.array().required(t('Supported Languages is required.')), defaultLanguage: Yup.object().nullable().required(t('Default Language is required.')), signaturePhrase: Yup.string().nullable().required(t('Webhook signature is required.')), @@ -151,7 +151,7 @@ export const Organisation = () => { component: Input, name: 'name', type: 'text', - placeholder: t('Organisation name'), + placeholder: t('Organization name'), }, { component: AutoComplete, @@ -187,7 +187,7 @@ export const Organisation = () => { component: Input, name: 'phone', type: 'text', - placeholder: t('Organisation phone number'), + placeholder: t('Organization phone number'), disabled: true, endAdornment: ( @@ -289,4 +289,4 @@ export const Organisation = () => { ); }; -export default Organisation; +export default Organization; diff --git a/src/containers/SettingList/OrganizationFlows/OrganisationFLows.test.tsx b/src/containers/SettingList/OrganizationFlows/OrganisationFLows.test.tsx index c5ca5e5d5..0920e687a 100644 --- a/src/containers/SettingList/OrganizationFlows/OrganisationFLows.test.tsx +++ b/src/containers/SettingList/OrganizationFlows/OrganisationFLows.test.tsx @@ -3,15 +3,15 @@ import UserEvent from '@testing-library/user-event'; import { MockedProvider } from '@apollo/client/testing'; import { BrowserRouter as Router } from 'react-router-dom'; -import { ORGANISATION_MOCKS } from '../SettingList.test.helper'; -import { OrganisationFlows } from './OrganisationFlows'; +import { ORGANIZATION_MOCKS } from '../SettingList.test.helper'; +import { OrganizationFlows } from './OrganizationFlows'; -const mocks = ORGANISATION_MOCKS; +const mocks = ORGANIZATION_MOCKS; const wrapper = ( - + ); @@ -39,9 +39,9 @@ test('it renders component and clicks cancel', async () => { test('it renders component in edit mode', async () => { const { getByText, getByTestId } = render( - + - + ); diff --git a/src/containers/SettingList/OrganizationFlows/OrganisationFlows.module.css b/src/containers/SettingList/OrganizationFlows/OrganizationFlows.module.css similarity index 100% rename from src/containers/SettingList/OrganizationFlows/OrganisationFlows.module.css rename to src/containers/SettingList/OrganizationFlows/OrganizationFlows.module.css diff --git a/src/containers/SettingList/OrganizationFlows/OrganisationFlows.tsx b/src/containers/SettingList/OrganizationFlows/OrganizationFlows.tsx similarity index 98% rename from src/containers/SettingList/OrganizationFlows/OrganisationFlows.tsx rename to src/containers/SettingList/OrganizationFlows/OrganizationFlows.tsx index 48fe14cbb..ce26e3d53 100644 --- a/src/containers/SettingList/OrganizationFlows/OrganisationFlows.tsx +++ b/src/containers/SettingList/OrganizationFlows/OrganizationFlows.tsx @@ -24,7 +24,7 @@ import { EXTENDED_TIME_FORMAT, setVariables, } from 'common/constants'; -import styles from './OrganisationFlows.module.css'; +import styles from './OrganizationFlows.module.css'; import dayjs from 'dayjs'; const SettingIcon = ; @@ -36,7 +36,7 @@ const queries = { deleteItemQuery: DELETE_ORGANIZATION, }; -export const OrganisationFlows = () => { +export const OrganizationFlows = () => { const client = useApolloClient(); const [hours, setHours] = useState(true); const [enabledDays, setEnabledDays] = useState([]); @@ -402,4 +402,4 @@ export const OrganisationFlows = () => { ); }; -export default OrganisationFlows; +export default OrganizationFlows; diff --git a/src/containers/SettingList/SettingList.test.helper.ts b/src/containers/SettingList/SettingList.test.helper.ts index 2a1bd3f70..d8a6d8e49 100644 --- a/src/containers/SettingList/SettingList.test.helper.ts +++ b/src/containers/SettingList/SettingList.test.helper.ts @@ -4,7 +4,7 @@ import { getOrganizationLanguagesQuery, getOrganizationQuery, getProvidersQuery, - getOrganisationSettings, + getOrganizationSettings, getCredential, getQualityRating, } from 'mocks/Organization'; @@ -64,11 +64,11 @@ export const LIST_ITEM_MOCKS = [ ...getOrganizationQuery, ...getProvidersQuery, ...getCredential, - getOrganisationSettings, + getOrganizationSettings, getOrganizationLanguagesQuery, ]; -const updateOrganisationMock = { +const updateOrganizationMock = { request: { query: UPDATE_ORGANIZATION, variables: { @@ -139,7 +139,7 @@ const updateOrganisationMock = { }, }; -const updateOrganisationMock2 = { +const updateOrganizationMock2 = { request: { query: UPDATE_ORGANIZATION, variables: { @@ -196,13 +196,13 @@ const updateOrganisationMock2 = { }, }; -export const ORGANISATION_MOCKS = [ +export const ORGANIZATION_MOCKS = [ getRoleNamesMock, getQualityRating, languageMock, getOrganizationLanguagesQuery, flowsMock, ...getOrganizationQuery, - updateOrganisationMock, - updateOrganisationMock2, + updateOrganizationMock, + updateOrganizationMock2, ]; diff --git a/src/containers/SettingList/SettingList.tsx b/src/containers/SettingList/SettingList.tsx index 8813a7b51..bc81dce6d 100644 --- a/src/containers/SettingList/SettingList.tsx +++ b/src/containers/SettingList/SettingList.tsx @@ -23,14 +23,14 @@ export const SettingList = () => { const List = [ { - name: 'Organisation', + name: 'Organization', shortcode: 'organization', - description: t('Manage organisation name, supported languages.'), + description: t('Manage organization name, supported languages.'), }, { name: 'Flows', shortcode: 'organization-flows', - description: t('Manage organisation flows.'), + description: t('Manage organization flows.'), }, { name: 'Billing', @@ -50,7 +50,7 @@ export const SettingList = () => { let CardList: any = []; if (providerData) { - // create setting list of Organisation & providers + // create setting list of Organization & providers CardList = [...List, ...providerData.providers]; } diff --git a/src/i18n/en/en.json b/src/i18n/en/en.json index 5fac17d25..6e6301af9 100644 --- a/src/i18n/en/en.json +++ b/src/i18n/en/en.json @@ -308,15 +308,15 @@ "Supported language is required.": "Supported language is required.", "Default language is required.": "Default language is required.", "Default language needs to be an active language.": "Default language needs to be an active language.", - "Organisation name is required.": "Organisation name is required.", + "Organization name is required.": "Organization name is required.", "Supported Languages is required.": "Supported Languages is required.", "Default Language is required.": "Default Language is required.", "Webhook signature is required.": "Webhook signature is required.", - "Organisation name": "Organisation name", + "Organization name": "Organization name", "Supported languages": "Supported languages", "Default language": "Default language", "Webhook signature": "Webhook signature", - "Organisation phone number": "Organisation phone number", + "Organization phone number": "Organization phone number", "WhatsApp tier": "WhatsApp tier", "Back to settings": "Back to settings", "Please select default flow ": "Please select default flow ", @@ -336,8 +336,8 @@ "New contact flow": "New contact flow", "For new contacts messaging your chatbot for the first time": "For new contacts messaging your chatbot for the first time", "Optin flow": "Optin flow", - "Manage organisation name, supported languages.": "Manage organisation name, supported languages.", - "Manage organisation flows.": "Manage organisation flows.", + "Manage organization name, supported languages.": "Manage organization name, supported languages.", + "Manage organization flows.": "Manage organization flows.", "Setup for glific billing account": "Setup for glific billing account", "Sheet name is required.": "Sheet name is required.", "You won't be able to use this sheet again.": "You won't be able to use this sheet again.", diff --git a/src/i18n/hi/hi.json b/src/i18n/hi/hi.json index d8bcff439..1f7055716 100644 --- a/src/i18n/hi/hi.json +++ b/src/i18n/hi/hi.json @@ -161,15 +161,15 @@ "Supported language is required.": "समर्थित भाषा की आवश्यकता है।", "Default language is required.": "डिफ़ॉल्ट भाषा की आवश्यकता है।", "Default language needs to be an active language.": "डिफ़ॉल्ट भाषा के लिए एक सक्रिय भाषा होना आवश्यक है।", - "Organisation name is required.": "संगठन का नाम आवश्यक है।", + "Organization name is required.": "संगठन का नाम आवश्यक है।", "Supported Languages is required.": "समर्थित भाषाओं की आवश्यकता है।", "Default Language is required.": "डिफ़ॉल्ट भाषा की आवश्यकता है।", "Webhook signature is required.": "वेबहूक हस्ताक्षर आवश्यक है।", - "Organisation name": "संगठन का नाम", + "Organization name": "संगठन का नाम", "Supported languages": "समर्थित भाषाएं", "Default language": "डिफ़ॉल्ट भाषा", "Webhook signature": "वेबहुक हस्ताक्षर", - "Organisation phone number": "संगठन का फ़ोन नंबर", + "Organization phone number": "संगठन का फ़ोन नंबर", "Hours of operations": "संचालन के घंटे", "Opens": "Opens", "Closes": "Closes", @@ -178,7 +178,7 @@ "the selected flow will be triggered for messages received outside hours of operations": "the selected flow will be triggered for messages received outside hours of operations", "Back to settings": "सेटिंग्स में वापस", "Is active?": "Is active?", - "Manage organisation name, supported languages.": "Manage organisation name, supported languages.", + "Manage Organization name, supported languages.": "Manage Organization name, supported languages.", "Setup for glific billing account": "ग्लिफिक बिलिंग खाते के लिए सेटअप", "Complete access to all the parts of the platform.": "Complete access to all the parts of the platform.", "Complete access to the platform except settings and staff management.": "Complete access to the platform except settings and staff management.", diff --git a/src/mocks/Flow.tsx b/src/mocks/Flow.tsx index c6af32777..476355a44 100644 --- a/src/mocks/Flow.tsx +++ b/src/mocks/Flow.tsx @@ -317,7 +317,7 @@ export const publishFlow = { }, }; -export const getOrganisationServicesQuery = { +export const getOrganizationServicesQuery = { request: { query: GET_ORGANIZATION_SERVICES, }, diff --git a/src/mocks/Organization.tsx b/src/mocks/Organization.tsx index 4f8f55599..ff6759fcc 100644 --- a/src/mocks/Organization.tsx +++ b/src/mocks/Organization.tsx @@ -158,7 +158,7 @@ export const getOrganizationQuery = [ }, }, ]; -export const getOrganisationSettings = { +export const getOrganizationSettings = { request: { query: GET_ORGANIZATION, variables: { id: '1' }, diff --git a/src/routes/AuthenticatedRoute/AuthenticatedRoute.tsx b/src/routes/AuthenticatedRoute/AuthenticatedRoute.tsx index 765ac441b..0c42af368 100644 --- a/src/routes/AuthenticatedRoute/AuthenticatedRoute.tsx +++ b/src/routes/AuthenticatedRoute/AuthenticatedRoute.tsx @@ -47,9 +47,9 @@ const Providers = lazy(() => import('containers/SettingList/Providers/Providers' const BlockContactList = lazy( () => import('containers/BlockContact/BlockContactList/BlockContactList') ); -const Organisation = lazy(() => import('containers/SettingList/Organisation/Organisation')); -const OrganisationFLows = lazy( - () => import('containers/SettingList/OrganizationFlows/OrganisationFlows') +const Organization = lazy(() => import('containers/SettingList/Organization/Organization')); +const OrganizationFlows = lazy( + () => import('containers/SettingList/OrganizationFlows/OrganizationFlows') ); const WebhookLogsList = lazy( () => import('containers/WebhookLogs/WebhookLogsList/WebhookLogsList') @@ -124,8 +124,8 @@ const routeAdmin = ( } /> } /> } /> - } /> - } /> + } /> + } /> } /> } /> } />