Skip to content

Commit cd137e9

Browse files
quentinovegaquentinovega
committed
rename usaerContext to globalContex
1 parent c7b1c7a commit cd137e9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+104
-104
lines changed

‎daikoku/javascript/src/apps/DaikokuApp.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ import { SessionModal } from '../contexts/modals/SessionModal';
5050
import { MessagesEvents } from '../services/messages';
5151
import { ISession, IState, ITenant, IUserSimple } from '../types';
5252
import { ResetPassword, Signup, TwoFactorAuthentication } from './DaikokuHomeApp';
53-
import { CurrentUserContext } from '../contexts/userContext';
53+
import { GlobalContext } from '../contexts/globalContext';
5454

5555
type DaikokuAppProps = {
5656
session: ISession,
@@ -431,7 +431,7 @@ const RouteWithTitle = (props: { title?: string, children: JSX.Element }) => {
431431
};
432432

433433
const UnauthenticatedRoute = (props: { children: JSX.Element, title: string }) => {
434-
const { connectedUser } = useContext(CurrentUserContext)
434+
const { connectedUser } = useContext(GlobalContext)
435435
if (connectedUser._humanReadableId) {
436436
return <Navigate to="/" />;
437437
}

‎daikoku/javascript/src/components/adminbackoffice/messages/messages.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import Select from 'react-select';
1111

1212
import { useTenantBackOffice } from '../../../contexts';
1313
import { I18nContext } from '../../../contexts/i18n-context';
14-
import { CurrentUserContext } from '../../../contexts/userContext';
14+
import { GlobalContext } from '../../../contexts/globalContext';
1515
import * as Services from '../../../services';
1616
import * as MessagesEvents from '../../../services/messages';
1717
import { IUserSimple, isError } from '../../../types';
@@ -40,7 +40,7 @@ export const AdminMessages = () => {
4040

4141
const [possibleNewUsers, setPossibleNewUsers] = useState<Array<IUserSimple>>([]);
4242

43-
const { connectedUser } = useContext(CurrentUserContext);
43+
const { connectedUser } = useContext(GlobalContext);
4444

4545
useEffect(() => {
4646
Services.fetchAllUsers()

‎daikoku/javascript/src/components/adminbackoffice/otoroshi/InititializeFromOtoroshi.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import StepWizard from 'react-step-wizard';
77
import { toast } from 'sonner';
88

99
import { I18nContext, useTenantBackOffice } from '../../../contexts';
10-
import { CurrentUserContext } from '../../../contexts/userContext';
10+
import { GlobalContext } from '../../../contexts/globalContext';
1111
import * as Services from '../../../services';
1212
import { isError } from '../../../types';
1313
import { BeautifulTitle, Can, Option, Spinner, tenant as TENANT, manage } from '../../utils';
@@ -22,7 +22,7 @@ import {
2222
} from './initialization';
2323

2424
export const InitializeFromOtoroshi = () => {
25-
const { tenant } = useContext(CurrentUserContext);
25+
const { tenant } = useContext(GlobalContext);
2626
useTenantBackOffice();
2727

2828
const [state, send] = useMachine<any>(theMachine);

‎daikoku/javascript/src/components/adminbackoffice/otoroshi/TenantOtoroshi.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ import { useLocation, useNavigate, useParams } from 'react-router-dom';
55
import { toast } from 'sonner';
66
import { useTenantBackOffice } from '../../../contexts';
77
import { I18nContext } from '../../../contexts/i18n-context';
8-
import { CurrentUserContext } from '../../../contexts/userContext';
8+
import { GlobalContext } from '../../../contexts/globalContext';
99
import * as Services from '../../../services';
1010
import { Can, tenant as TENANT, manage } from '../../utils';
1111

1212
export const TenantOtoroshi = () => {
13-
const { tenant } = useContext(CurrentUserContext);
13+
const { tenant } = useContext(GlobalContext);
1414
useTenantBackOffice();
1515

1616
const { translate, Translation } = useContext(I18nContext);

‎daikoku/javascript/src/components/adminbackoffice/otoroshi/TenantOtoroshis.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ import { createColumnHelper } from '@tanstack/react-table';
66
import { toast } from 'sonner';
77
import { ModalContext, useTenantBackOffice } from '../../../contexts';
88
import { I18nContext } from '../../../contexts/i18n-context';
9-
import { CurrentUserContext } from '../../../contexts/userContext';
9+
import { GlobalContext } from '../../../contexts/globalContext';
1010
import * as Services from '../../../services';
1111
import { IOtoroshiSettings, isError } from '../../../types';
1212
import { Table, TableRef } from '../../inputs';
1313
import { Can, tenant as TENANT, manage } from '../../utils';
1414

1515
export const TenantOtoroshis = () => {
16-
const { tenant, connectedUser } = useContext(CurrentUserContext);
16+
const { tenant, connectedUser } = useContext(GlobalContext);
1717
const { translate } = useContext(I18nContext);
1818
const { confirm } = useContext(ModalContext);
1919
const navigate = useNavigate();

‎daikoku/javascript/src/components/adminbackoffice/otoroshi/initialization/steps.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import Creatable from 'react-select/creatable';
99
import { createColumnHelper } from '@tanstack/react-table';
1010
import { ModalContext } from '../../../../contexts';
1111
import { I18nContext } from '../../../../contexts/i18n-context';
12-
import { CurrentUserContext } from '../../../../contexts/userContext';
12+
import { GlobalContext } from '../../../../contexts/globalContext';
1313
import * as Services from '../../../../services';
1414
import { IApiKey, ISubscription } from '../../../../types/api';
1515
import { Table, TableRef } from '../../../inputs';
@@ -564,7 +564,7 @@ export const ApiKeyStep = (props: ApiKeyStepProps) => {
564564

565565
const ApiKey = (props: any) => {
566566
const { translate } = useContext(I18nContext);
567-
const { tenant } = useContext(CurrentUserContext)
567+
const { tenant } = useContext(GlobalContext)
568568
const [selectedApi, setSelectedApi] = useState(
569569
props
570570
.maybeCreatedSub(props.apikey)

‎daikoku/javascript/src/components/adminbackoffice/sessions/SessionList.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ import * as Services from '../../../services';
66
import { createColumnHelper } from '@tanstack/react-table';
77
import { ModalContext, useDaikokuBackOffice } from '../../../contexts';
88
import { I18nContext } from '../../../contexts/i18n-context';
9-
import { CurrentUserContext } from '../../../contexts/userContext';
9+
import { GlobalContext } from '../../../contexts/globalContext';
1010
import { ISession } from '../../../types';
1111
import { Table, TableRef } from '../../inputs';
1212
import { Can, daikoku, manage } from '../../utils';
1313

1414
export const SessionList = () => {
15-
const { connectedUser } = useContext(CurrentUserContext)
15+
const { connectedUser } = useContext(GlobalContext)
1616
;
1717
useDaikokuBackOffice();
1818

‎daikoku/javascript/src/components/adminbackoffice/tenants/MailingInternalization.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { toast } from 'sonner';
88
import { ModalContext, useTenantBackOffice } from '../../../contexts';
99
import { I18nContext } from '../../../contexts/i18n-context';
1010
import { AssetChooserByModal, MimeTypeFilter } from '../../../contexts/modals/AssetsChooserModal';
11-
import { CurrentUserContext } from '../../../contexts/userContext';
11+
import { GlobalContext } from '../../../contexts/globalContext';
1212
import * as Services from '../../../services';
1313
import { IMailingTranslation, ITenantFull, isError } from '../../../types';
1414
import { Table, TableRef } from '../../inputs';
@@ -162,7 +162,7 @@ const EditMailtemplate = ({
162162
export const MailingInternalization = () => {
163163
useTenantBackOffice();
164164
const table = useRef<TableRef>();
165-
const { tenant } = useContext(CurrentUserContext);
165+
const { tenant } = useContext(GlobalContext);
166166

167167
const { domain } = useParams();
168168

‎daikoku/javascript/src/components/adminbackoffice/tenants/TenantAdminList.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ import {
1717
import { I18nContext } from '../../../contexts';
1818
import { ModalContext, useDaikokuBackOffice, useTenantBackOffice } from '../../../contexts';
1919
import { isError, IState, IStateContext, ITeamSimple, ITenantFull, IUser, IUserSimple } from '../../../types';
20-
import { CurrentUserContext } from '../../../contexts/userContext';
20+
import { GlobalContext } from '../../../contexts/globalContext';
2121

2222
const AdminList = () => {
23-
const context = useContext(CurrentUserContext);
23+
const context = useContext(GlobalContext);
2424

2525
const [search, setSearch] = useState('');
2626
const [addableAdmins, setAddableAdmins] = useState<Array<IUser>>([]);

‎daikoku/javascript/src/components/adminbackoffice/users/UserEdit.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { I18nContext, ModalContext, useDaikokuBackOffice } from '../../../contex
1010
import * as Services from '../../../services';
1111
import { IState, ITenant, IUser } from '../../../types';
1212
import { Can, daikoku, manage, Spinner } from '../../utils';
13-
import { CurrentUserContext } from '../../../contexts/userContext';
13+
import { GlobalContext } from '../../../contexts/globalContext';
1414

1515
const Avatar = ({
1616
setValue,
@@ -167,7 +167,7 @@ const PictureUpload = (props: { setFiles: (l: FileList | null) => void }) => {
167167
};
168168

169169
export const UserEdit = () => {
170-
const { tenant } = useContext(CurrentUserContext);
170+
const { tenant } = useContext(GlobalContext);
171171
useDaikokuBackOffice();
172172
const { translate, Translation } = useContext(I18nContext);
173173
const { confirm } = useContext(ModalContext);

‎daikoku/javascript/src/components/adminbackoffice/users/UserList.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ import { toast } from 'sonner';
55

66
import { ModalContext, useDaikokuBackOffice } from '../../../contexts';
77
import { I18nContext } from '../../../contexts/i18n-context';
8-
import { CurrentUserContext } from '../../../contexts/userContext';
8+
import { GlobalContext } from '../../../contexts/globalContext';
99
import * as Services from '../../../services';
1010
import { IUserSimple, isError } from '../../../types';
1111
import { AvatarWithAction, Can, PaginatedComponent, daikoku, manage } from '../../utils';
1212

1313
export const UserList = () => {
14-
const { connectedUser } = useContext(CurrentUserContext);
14+
const { connectedUser } = useContext(GlobalContext);
1515
useDaikokuBackOffice();
1616

1717
const { alert, confirm } = useContext(ModalContext);

‎daikoku/javascript/src/components/backoffice/apikeys/TeamApiKeys.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ import { useContext, useEffect, useRef, useState } from 'react';
33
import { Link } from 'react-router-dom';
44

55
import { I18nContext, ModalContext, useTeamBackOffice } from '../../../contexts';
6-
import { CurrentUserContext } from '../../../contexts/userContext';
6+
import { GlobalContext } from '../../../contexts/globalContext';
77
import * as Services from '../../../services';
88
import { IApi, ITeamSimple, isError } from '../../../types';
99
import { Table, TableRef } from '../../inputs';
1010
import { Can, Spinner, apikey, isUserIsTeamAdmin, manage, teamPermissions } from '../../utils';
1111
import { TeamBackOfficeProps } from '../TeamBackOffice';
1212

1313
export const TeamApiKeys = (props: TeamBackOfficeProps) => {
14-
const { connectedUser } = useContext(CurrentUserContext);
14+
const { connectedUser } = useContext(GlobalContext);
1515

1616
const tableRef = useRef<TableRef>();
1717
const [showApiKey, setShowApiKey] = useState(false);

‎daikoku/javascript/src/components/backoffice/apis/TeamApi.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import {
2424
} from '../../../contexts';
2525
import { IState, IStateContext, ITeamSimple } from '../../../types';
2626
import { IApi, IUsagePlan, isError } from '../../../types/api';
27-
import { CurrentUserContext } from '../../../contexts/userContext';
27+
import { GlobalContext } from '../../../contexts/globalContext';
2828
import { TeamBackOfficeProps } from '../TeamBackOffice';
2929

3030
const reservedCharacters = [';', '/', '?', ':', '@', '&', '=', '+', '$', ','];
@@ -96,7 +96,7 @@ export const TeamApi = (props: TeamBackOfficeProps<{ creation: boolean }>) => {
9696
const navigate = useNavigate();
9797
const match = useMatch('/:teamId/settings/apis/:apiId/:version/stats/plan/:planId');
9898

99-
const { tenant } = useContext(CurrentUserContext);
99+
const { tenant } = useContext(GlobalContext);
100100
const { translate } = useContext(I18nContext);
101101
const { openApiDocumentationSelectModal } = useContext(ModalContext);
102102

‎daikoku/javascript/src/components/backoffice/apis/TeamApiDocumentation.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { IApi, IAsset, IDocPage, IDocumentation, IDocumentationPage, IDocumentat
1212
import { BeautifulTitle } from '../../utils';
1313
import { SortableTree } from '../../utils/dnd/SortableTree';
1414
import { Wrapper } from '../../utils/dnd/Wrapper';
15-
import { CurrentUserContext } from '../../../contexts/userContext';
15+
import { GlobalContext } from '../../../contexts/globalContext';
1616

1717
const mimeTypes = [
1818
{ label: '.adoc Ascii doctor', value: 'text/asciidoc' },
@@ -113,7 +113,7 @@ export const TeamApiDocumentation = (props: TeamApiDocumentationProps) => {
113113
const { translate } = useContext(I18nContext);
114114
const { confirm, openFormModal } = useContext(ModalContext);
115115

116-
const { tenant } = useContext(CurrentUserContext);
116+
const { tenant } = useContext(GlobalContext);
117117

118118
const queryClient = useQueryClient();
119119

‎daikoku/javascript/src/components/backoffice/apis/TeamApiGroup.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
TeamPlanConsumption,
1313
} from '.';
1414
import { I18nContext, ModalContext, useApiGroupBackOffice } from '../../../contexts';
15-
import { CurrentUserContext } from '../../../contexts/userContext';
15+
import { GlobalContext } from '../../../contexts/globalContext';
1616
import * as Services from '../../../services';
1717
import { IApi, ITeamSimple, IUsagePlan, isError } from '../../../types';
1818
import { api as API, Can, Spinner, manage } from '../../utils';
@@ -28,7 +28,7 @@ export const TeamApiGroup = (props: TeamBackOfficeProps) => {
2828
const navigate = useNavigate();
2929
const match = useMatch('/:teamId/settings/apigroups/:apiGroupId/stats/plan/:planId');
3030

31-
const { tenant } = useContext(CurrentUserContext);
31+
const { tenant } = useContext(GlobalContext);
3232

3333
const state: LocationState = location.state as LocationState
3434
const creation = state?.newApiGroup;

‎daikoku/javascript/src/components/backoffice/apis/TeamApiPricings.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import { Help } from '../apikeys';
3636
import { TeamApiDocumentation } from './TeamApiDocumentation';
3737
import { TeamApiSwagger } from './TeamApiSwagger';
3838
import { TeamApiTesting } from './TeamApiTesting';
39-
import { CurrentUserContext } from '../../../contexts/userContext';
39+
import { GlobalContext } from '../../../contexts/globalContext';
4040
import { TeamBackOfficeProps } from '../TeamBackOffice';
4141

4242
const SUBSCRIPTION_PLAN_TYPES = {
@@ -369,7 +369,7 @@ const Card = ({
369369
}: CardProps) => {
370370
const { translate, Translation } = useContext(I18nContext);
371371
const { confirm } = useContext(ModalContext);
372-
const { tenant } = useContext(CurrentUserContext);
372+
const { tenant } = useContext(GlobalContext);
373373

374374
const pricing = renderPricing(plan, translate)
375375

@@ -520,7 +520,7 @@ export const TeamApiPricings = (props: TeamBackOfficeProps<Props>) => {
520520

521521
const { translate } = useContext(I18nContext);
522522
const { openApiSelectModal, confirm } = useContext(ModalContext);
523-
const { tenant } = useContext(CurrentUserContext);
523+
const { tenant } = useContext(GlobalContext);
524524

525525
const queryClient = useQueryClient()
526526
const queryFullTenant = useQuery({ queryKey: ['full-tenant'], queryFn: () => Services.oneTenant(props.tenant._id) })

‎daikoku/javascript/src/components/backoffice/apis/TeamApis.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ import { Link } from 'react-router-dom';
44
import { toast } from 'sonner';
55

66
import { I18nContext, ModalContext } from '../../../contexts';
7-
import { CurrentUserContext } from '../../../contexts/userContext';
7+
import { GlobalContext } from '../../../contexts/globalContext';
88
import * as Services from '../../../services';
99
import { IApi, ITeamSimple, isError } from '../../../types';
1010
import { Table, TableRef } from '../../inputs';
1111
import { api as API, Can, Spinner, manage, read } from '../../utils';
1212
import { TeamBackOfficeProps } from '../TeamBackOffice';
1313

1414
export const TeamApis = (props: TeamBackOfficeProps) => {
15-
const { tenant } = useContext(CurrentUserContext);
15+
const { tenant } = useContext(GlobalContext);
1616

1717
const { translate } = useContext(I18nContext);
1818
const { confirm } = useContext(ModalContext);

‎daikoku/javascript/src/components/backoffice/assets/AssetsList.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { I18nContext } from '../../../contexts';
1010
import { ModalContext } from '../../../contexts';
1111
import { createColumnHelper } from '@tanstack/react-table';
1212
import { IAsset, IState, IStateContext, ITeamSimple } from '../../../types';
13-
import { CurrentUserContext } from '../../../contexts/userContext';
13+
import { GlobalContext } from '../../../contexts/globalContext';
1414

1515

1616
const mimeTypes = [
@@ -145,7 +145,7 @@ export const AssetsList = ({
145145
currentTeam
146146
}: { currentTeam?: ITeamSimple }) => {
147147
const tableRef = useRef<TableRef>();
148-
const { tenant } = useContext(CurrentUserContext);
148+
const { tenant } = useContext(GlobalContext);
149149

150150
const { translate } = useContext(I18nContext);
151151
const { confirm, openFormModal } = useContext(ModalContext);

‎daikoku/javascript/src/components/backoffice/me/MyProfile.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { ModalContext, useUserBackOffice } from '../../../contexts';
77
import { I18nContext } from '../../../contexts';
88
import * as Services from '../../../services';
99
import { IState, ITenant } from '../../../types';
10-
import { CurrentUserContext } from '../../../contexts/userContext';
10+
import { GlobalContext } from '../../../contexts/globalContext';
1111

1212
const TwoFactorAuthentication = ({
1313
user
@@ -293,7 +293,7 @@ export const MyProfile = () => {
293293
const [user, setUser] = useState();
294294
const [tab, setTab] = useState('infos');
295295

296-
const { tenant, reloadContext } = useContext(CurrentUserContext);
296+
const { tenant, reloadContext } = useContext(GlobalContext);
297297

298298
const { translate, setLanguage, language, Translation, languages } = useContext(I18nContext);
299299
const { confirm } = useContext(ModalContext);

‎daikoku/javascript/src/components/backoffice/members/TeamMembers.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {
1717
team, user
1818
} from '../../utils';
1919

20-
import { CurrentUserContext } from '../../../contexts/userContext';
20+
import { GlobalContext } from '../../../contexts/globalContext';
2121
import { ITeamSimple, IUserSimple, ResponseError, TeamPermission, TeamUser } from '../../../types';
2222
import { TeamBackOfficeProps } from '../TeamBackOffice';
2323
import { props } from 'cypress/types/bluebird';
@@ -38,7 +38,7 @@ type TState = {
3838
}
3939
export const TeamMembersSimpleComponent = ({ currentTeam, reloadCurrentTeam }: TeamBackOfficeProps) => {
4040

41-
const { tenant, connectedUser, reloadContext } = useContext(CurrentUserContext);
41+
const { tenant, connectedUser, reloadContext } = useContext(GlobalContext);
4242

4343
const [state, setState] = useState<TState>({
4444
pendingUsers: [],

‎daikoku/javascript/src/components/backoffice/messages/context.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import * as Services from '../../../services';
66
import * as MessageEvents from '../../../services/messages';
77
import { isError, IState, ITeamSimple, IUserSimple } from '../../../types';
88
import { Option, partition } from '../../utils';
9-
import { CurrentUserContext } from '../../../contexts/userContext';
9+
import { GlobalContext } from '../../../contexts/globalContext';
1010

1111
const initMessageContext = {
1212
messages: [],
@@ -45,7 +45,7 @@ export const MessagesProvider = ({
4545
const [lastClosedDates, setLastClosedDates] = useState<Array<any>>([]);
4646
const [loading, setLoading] = useState<boolean>(false);
4747

48-
const { connectedUser } = useContext(CurrentUserContext)
48+
const { connectedUser } = useContext(GlobalContext)
4949

5050
const sseId = nanoid(64);
5151

‎daikoku/javascript/src/components/backoffice/widgets/teamDemands.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { FeedbackButton } from '../../utils/FeedbackButton';
1111
import { Widget } from './widget';
1212
import { ModalContext } from '../../../contexts';
1313
import { Option } from '../../utils';
14-
import { CurrentUserContext } from '../../../contexts/userContext';
14+
import { GlobalContext } from '../../../contexts/globalContext';
1515

1616
type LastDemandsProps = {
1717
team: ITeamSimple
@@ -49,7 +49,7 @@ export const LastDemands = (props: LastDemandsProps) => {
4949
}
5050
}
5151
`
52-
const { connectedUser } = useContext(CurrentUserContext);
52+
const { connectedUser } = useContext(GlobalContext);
5353
const { translate } = useContext(I18nContext);
5454
const { confirm } = useContext(ModalContext);
5555
const { client } = useContext(getApolloContext());

0 commit comments

Comments
 (0)