Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 0 additions & 10 deletions config/oxlint/oxlint.seatbelt.tsv
Original file line number Diff line number Diff line change
Expand Up @@ -1081,21 +1081,13 @@
"../../src/pages/domain/BaseDomainRequireTwoFactorAuthPage.tsx" "no-restricted-imports" 1
"../../src/pages/domain/BaseDomainSettingsPage.tsx" "no-restricted-imports" 1
"../../src/pages/domain/BaseDomainVerifiedPage.tsx" "no-restricted-imports" 1
"../../src/pages/domain/BaseDomainVerifiedPage.tsx" "rulesdir/no-onyx-loading-status" 1
"../../src/pages/domain/BaseVerifyDomainPage.tsx" "no-restricted-imports" 1
"../../src/pages/domain/BaseVerifyDomainPage.tsx" "rulesdir/no-onyx-loading-status" 1
"../../src/pages/domain/DomainAccessRestrictedPage.tsx" "no-restricted-imports" 1
"../../src/pages/domain/DomainAddedPage.tsx" "no-restricted-imports" 1
"../../src/pages/domain/DomainAddedPage.tsx" "rulesdir/no-onyx-loading-status" 1
"../../src/pages/domain/DomainAlreadyExistsPage.tsx" "no-restricted-imports" 1
"../../src/pages/domain/DomainInitialPage.tsx" "no-restricted-imports" 1
"../../src/pages/domain/DomainInitialPage.tsx" "rulesdir/no-onyx-loading-status" 1
"../../src/pages/domain/DomainNameOrNotFoundWrapper.tsx" "rulesdir/no-onyx-loading-status" 1
"../../src/pages/domain/DomainNotFoundPageWrapper.tsx" "rulesdir/no-onyx-loading-status" 1
"../../src/pages/domain/DomainResetPage.tsx" "no-restricted-imports" 1
"../../src/pages/domain/DomainResetPage.tsx" "rulesdir/no-onyx-loading-status" 1
"../../src/pages/domain/DomainSamlPage.tsx" "no-restricted-imports" 1
"../../src/pages/domain/DomainSamlPage.tsx" "rulesdir/no-onyx-loading-status" 1
"../../src/pages/domain/Groups/BaseDomainGroupPreferredWorkspacePage.tsx" "no-restricted-imports" 1
"../../src/pages/domain/Groups/DomainGroupCreatePage.tsx" "no-restricted-imports" 1
"../../src/pages/domain/Groups/DomainGroupDetailsPage.tsx" "no-restricted-imports" 1
Expand All @@ -1105,7 +1097,6 @@
"../../src/pages/domain/Members/DomainMembersPage.tsx" "no-restricted-imports" 1
"../../src/pages/domain/Members/MoveUserBetweenGroupsPage.tsx" "no-restricted-imports" 1
"../../src/pages/domain/Members/MoveUsersBetweenGroupsPage.tsx" "no-restricted-imports" 1
"../../src/pages/domain/Saml/SamlConfigurationDetailsSectionContent.tsx" "rulesdir/no-onyx-loading-status" 1
"../../src/pages/DynamicEditReportFieldPage.tsx" "no-restricted-imports" 1
"../../src/pages/DynamicFlagCommentPage.tsx" "@typescript-eslint/no-deprecated/MenuItem" 1
"../../src/pages/DynamicFlagCommentPage.tsx" "no-restricted-imports" 1
Expand Down Expand Up @@ -2188,7 +2179,6 @@
"../../tests/ui/components/SettlementButtonTest.tsx" "@typescript-eslint/no-unnecessary-type-assertion" 7
"../../tests/ui/ComposerImperativeRefTest.tsx" "@typescript-eslint/no-deprecated/keyCode" 1
"../../tests/ui/ComposerTest.tsx" "rulesdir/no-raw-typography" 1
"../../tests/ui/DomainNameOrNotFoundWrapperTest.tsx" "@typescript-eslint/no-unsafe-member-access" 1
"../../tests/ui/DynamicReportDetailsPageTest.tsx" "@typescript-eslint/no-unnecessary-type-assertion" 2
"../../tests/ui/DynamicWorkspaceWorkflowsApprovalsExpensesFromPageFastEditSaveTest.tsx" "@typescript-eslint/no-unnecessary-type-assertion" 1
"../../tests/ui/DynamicWorkspaceWorkflowsApprovalsExpensesFromPageTest.tsx" "@typescript-eslint/no-unnecessary-type-assertion" 1
Expand Down
8 changes: 1 addition & 7 deletions src/pages/domain/BaseDomainVerifiedPage.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import ConfirmationPage from '@components/ConfirmationPage';
import FixedFooter from '@components/FixedFooter';
import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
import HeaderWithBackButton from '@components/HeaderWithBackButton';
import RenderHTML from '@components/RenderHTML';
import ScreenWrapper from '@components/ScreenWrapper';
Expand All @@ -18,7 +17,6 @@ import ONYXKEYS from '@src/ONYXKEYS';
import type {Route} from '@src/ROUTES';
import ROUTES from '@src/ROUTES';
import {isAdminSelector} from '@src/selectors/Domain';
import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
import type {SentryLabel} from '@src/types/utils/SentryLabel';

import {Str} from 'expensify-common';
Expand All @@ -43,7 +41,7 @@ function BaseDomainVerifiedPage({domainAccountID, redirectTo, confirmDestination
const styles = useThemeStyles();
const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails();

const [domain, domainMetadata] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`);
const [domain] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`);
const isAdmin = isAdminSelector(currentUserAccountID)(domain);
const doesDomainExist = !!domain;

Expand All @@ -54,10 +52,6 @@ function BaseDomainVerifiedPage({domainAccountID, redirectTo, confirmDestination
Navigation.setNavigationActionToMicrotaskQueue(() => Navigation.navigate(redirectTo, {forceReplace: true}));
}, [domainAccountID, domain?.validated, doesDomainExist, redirectTo]);

if (isLoadingOnyxValue(domainMetadata)) {
return <FullScreenLoadingIndicator />;
}

if (!domain || !isAdmin) {
return <NotFoundPage onLinkPress={() => Navigation.dismissModal()} />;
}
Expand Down
6 changes: 2 additions & 4 deletions src/pages/domain/BaseVerifyDomainPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import type {Route} from '@src/ROUTES';
import {isAdminSelector} from '@src/selectors/Domain';
import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';

import type {PropsWithChildren} from 'react';

Expand Down Expand Up @@ -66,8 +65,7 @@ function BaseVerifyDomainPage({domainAccountID, forwardTo, fallbackTo, shouldDis
const {translate} = useLocalize();
const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails();

const [domain, domainMetadata] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`);
const isLoadingDomain = isLoadingOnyxValue(domainMetadata);
const [domain] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`);
const domainName = domain?.email ? Str.extractEmailDomain(domain.email) : '';
const doesDomainExist = !!domain;

Expand Down Expand Up @@ -106,7 +104,7 @@ function BaseVerifyDomainPage({domainAccountID, forwardTo, fallbackTo, shouldDis
resetDomainValidationError(domainAccountID);
}, [domainAccountID, doesDomainExist]);

if (isLoadingDomain || isRedirecting) {
if (isRedirecting) {
return <FullScreenLoadingIndicator />;
}

Expand Down
9 changes: 1 addition & 8 deletions src/pages/domain/DomainAddedPage.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import ConfirmationPageDefault from '@components/ConfirmationPage/composed/ConfirmationPageDefault';
import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
import HeaderWithBackButton from '@components/HeaderWithBackButton';
import {loadIllustration} from '@components/Icon/IllustrationLoader';
import ScreenWrapper from '@components/ScreenWrapper';
Expand All @@ -20,7 +19,6 @@ import ONYXKEYS from '@src/ONYXKEYS';
import ROUTES from '@src/ROUTES';
import type SCREENS from '@src/SCREENS';
import {isAdminSelector} from '@src/selectors/Domain';
import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';

import React from 'react';

Expand All @@ -32,14 +30,9 @@ function DomainAddedPage({route}: DomainAddedPageProps) {
const styles = useThemeStyles();
const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails();
const domainAccountID = route.params.domainAccountID;
const [domain, domainMetadata] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`);
const [domain] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`);
const isAdmin = isAdminSelector(currentUserAccountID)(domain);

const isDomainLoading = isLoadingOnyxValue(domainMetadata);
if (isDomainLoading) {
return <FullScreenLoadingIndicator />;
}

if (!isAdmin) {
return <NotFoundPage onLinkPress={() => Navigation.dismissModal()} />;
}
Expand Down
9 changes: 3 additions & 6 deletions src/pages/domain/DomainInitialPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import ONYXKEYS from '@src/ONYXKEYS';
import ROUTES from '@src/ROUTES';
import type SCREENS from '@src/SCREENS';
import {isAdminSelector, pendingAdminRequesterAccountIDsSelector} from '@src/selectors/Domain';
import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';

import {findFocusedRoute, useNavigationState} from '@react-navigation/native';
import {Str} from 'expensify-common';
Expand All @@ -56,7 +55,7 @@ function DomainInitialPage({route}: DomainInitialPageProps) {
const {translate} = useLocalize();
const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails();
const domainAccountID = route.params?.domainAccountID;
const [domain, domainMetadata] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`);
const [domain] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`);
const domainName = domain?.email ? Str.extractEmailDomain(domain.email) : undefined;
useDocumentTitle(domainName ?? '');
const isAdmin = isAdminSelector(currentUserAccountID)(domain);
Expand Down Expand Up @@ -94,15 +93,13 @@ function DomainInitialPage({route}: DomainInitialPageProps) {

useNetwork({onReconnect: fetchDomainData});

const shouldShowFullScreenLoadingIndicator = isLoadingOnyxValue(domainMetadata);

useEffect(() => {
if (shouldShowFullScreenLoadingIndicator || (domain && isAdmin)) {
if (domain && isAdmin) {
return;
}

Navigation.goBack(ROUTES.DOMAINS_LIST.route);
}, [domain, isAdmin, shouldShowFullScreenLoadingIndicator]);
}, [domain, isAdmin]);

return (
<ScreenWrapper
Expand Down
11 changes: 2 additions & 9 deletions src/pages/domain/DomainNameOrNotFoundWrapper.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';

import useOnyx from '@hooks/useOnyx';

import NotFoundPage from '@pages/ErrorPage/NotFoundPage';

import ONYXKEYS from '@src/ONYXKEYS';
import {domainNameSelector} from '@src/selectors/Domain';
import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';

import type {ReactNode} from 'react';

Expand All @@ -18,16 +15,12 @@ type DomainNameOrNotFoundWrapperProps = {
/** Called when the not found page's link is pressed */
onLinkPress?: () => void;

/** The children to render once the domain name has loaded, given the loaded domain name */
/** The children to render when the domain exists, given its domain name */
children: (domainName: string) => ReactNode;
};

function DomainNameOrNotFoundWrapper({domainAccountID, onLinkPress, children}: DomainNameOrNotFoundWrapperProps) {
const [domainName, domainNameResult] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`, {selector: domainNameSelector});

if (isLoadingOnyxValue(domainNameResult)) {
return <FullScreenLoadingIndicator />;
}
const [domainName] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`, {selector: domainNameSelector});

if (!domainName) {
return <NotFoundPage onLinkPress={onLinkPress} />;
Expand Down
15 changes: 3 additions & 12 deletions src/pages/domain/DomainNotFoundPageWrapper.tsx
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
import type {FullPageNotFoundViewProps} from '@components/BlockingViews/FullPageNotFoundView';
import FullscreenLoadingIndicator from '@components/FullscreenLoadingIndicator';

import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
import useOnyx from '@hooks/useOnyx';
import useResponsiveLayout from '@hooks/useResponsiveLayout';

import Navigation from '@navigation/Navigation';

import NotFoundPage from '@pages/ErrorPage/NotFoundPage';

import ONYXKEYS from '@src/ONYXKEYS';
import ROUTES from '@src/ROUTES';
import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';

import {adminAccountIDsSelector} from '@selectors/Domain';
import React, {useEffect} from 'react';
Expand All @@ -28,28 +25,22 @@ type DomainNotFoundPageWrapperProps = {
} & Pick<FullPageNotFoundViewProps, 'subtitleKey' | 'onLinkPress'>;

function DomainNotFoundPageWrapper({domainAccountID, shouldBeBlocked, fullPageNotFoundViewProps, ...props}: DomainNotFoundPageWrapperProps) {
const [domain, domainMetadata] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`);
const [domain] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`);
const [adminAccountIDs] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`, {
selector: adminAccountIDsSelector,
});
const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails();
const isAdmin = adminAccountIDs?.includes(currentUserAccountID);
const {shouldUseNarrowLayout} = useResponsiveLayout();

const shouldShowFullScreenLoadingIndicator = isLoadingOnyxValue(domainMetadata);
const shouldShowNotFoundPage = !domain || !isAdmin || shouldBeBlocked;

useEffect(() => {
if (shouldShowFullScreenLoadingIndicator || (domain && isAdmin)) {
if (domain && isAdmin) {
return;
}

Navigation.dismissModal();
}, [domain, isAdmin, shouldShowFullScreenLoadingIndicator]);

if (shouldShowFullScreenLoadingIndicator) {
return <FullscreenLoadingIndicator shouldUseGoBackButton={shouldUseNarrowLayout} />;
}
}, [domain, isAdmin]);

if (shouldShowNotFoundPage) {
return (
Expand Down
10 changes: 4 additions & 6 deletions src/pages/domain/DomainResetPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
import type SCREENS from '@src/SCREENS';
import {adminAccountIDsSelector, domainNameSelector} from '@src/selectors/Domain';
import INPUT_IDS from '@src/types/form/ResetDomainForm';
import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';

import React, {useEffect} from 'react';
import {View} from 'react-native';
Expand All @@ -40,21 +39,20 @@ function DomainResetDomainPage({route}: DomainResetDomainPageProps) {
const {translate} = useLocalize();
const styles = useThemeStyles();

const [domain, domainMetadata] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN}${route.params.domainAccountID}`);
const [domain] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN}${route.params.domainAccountID}`);

// Selectors used this way bc when useOnyx with it the metadata is wrong + we're already have domain data here
// We already read the whole domain here, so we derive these from it instead of adding more useOnyx subscriptions
const domainName = domainNameSelector(domain);
const adminAccountIDs = adminAccountIDsSelector(domain);
const domainHasOnlyOneAdmin = adminAccountIDs?.length === 1;
const isLoadingDomain = isLoadingOnyxValue(domainMetadata);

useEffect(() => {
// Make sure reset domain page cannot be accessed if there is more than 1 admin
if (isLoadingDomain || domainHasOnlyOneAdmin) {
if (domainHasOnlyOneAdmin) {
return;
}
Navigation.goBack(ROUTES.DOMAIN_ADMIN_DETAILS.getRoute(domainAccountID, accountID));
}, [accountID, domainAccountID, domainHasOnlyOneAdmin, isLoadingDomain]);
}, [accountID, domainAccountID, domainHasOnlyOneAdmin]);

const missingDomainData = !domain || !domainName;
const isSubmitDisabled = missingDomainData || !domainHasOnlyOneAdmin;
Expand Down
10 changes: 2 additions & 8 deletions src/pages/domain/DomainSamlPage.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
import FeatureList from '@components/FeatureList';
import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
import HeaderWithBackButton from '@components/HeaderWithBackButton';
import ScreenWrapper from '@components/ScreenWrapper';
import ScrollView from '@components/ScrollView';
Expand All @@ -25,7 +24,6 @@ import ONYXKEYS from '@src/ONYXKEYS';
import ROUTES from '@src/ROUTES';
import type SCREENS from '@src/SCREENS';
import {domainMemberSettingsSelector, isAdminSelector} from '@src/selectors/Domain';
import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';

import {Str} from 'expensify-common';
import React from 'react';
Expand All @@ -44,9 +42,9 @@ function DomainSamlPage({route}: DomainSamlPageProps) {

const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails();
const domainAccountID = route.params?.domainAccountID;
const [domain, domainResults] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`);
const [domain] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`);
const isAdmin = isAdminSelector(currentUserAccountID)(domain);
const [domainSettings, domainSettingsResults] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_DOMAIN_MEMBER}${domainAccountID}`, {
const [domainSettings] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_DOMAIN_MEMBER}${domainAccountID}`, {
selector: domainMemberSettingsSelector,
});

Expand All @@ -56,10 +54,6 @@ function DomainSamlPage({route}: DomainSamlPageProps) {
useDomainDocumentTitle(domainName, 'domain.saml');
const doesDomainExist = !!domain;

if (isLoadingOnyxValue(domainResults, domainSettingsResults)) {
return <FullScreenLoadingIndicator shouldUseGoBackButton={shouldUseNarrowLayout} />;
}

return (
<ScreenWrapper
enableEdgeToEdgeBottomSafeAreaPadding
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import variables from '@styles/variables';

import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';

import React, {useEffect} from 'react';
import {View} from 'react-native';
Expand All @@ -40,7 +39,7 @@ function SamlConfigurationDetailsSectionContent({accountID, domainName, shouldSh
const {translate} = useLocalize();
const styles = useThemeStyles();

const [samlMetadata, samlMetadataResults] = useOnyx(`${ONYXKEYS.COLLECTION.SAML_METADATA}${accountID}`);
const [samlMetadata] = useOnyx(`${ONYXKEYS.COLLECTION.SAML_METADATA}${accountID}`);

useEffect(() => {
if (!domainName) {
Expand All @@ -49,7 +48,7 @@ function SamlConfigurationDetailsSectionContent({accountID, domainName, shouldSh
getSamlSettings(accountID, domainName);
}, [accountID, domainName]);

if (samlMetadata?.isLoading || isLoadingOnyxValue(samlMetadataResults)) {
if (samlMetadata?.isLoading) {
return <ActivityIndicator size={CONST.ACTIVITY_INDICATOR_SIZE.LARGE} />;
}

Expand Down
Loading
Loading