Skip to content

Commit

Permalink
TOAZ-339: Remove Azure Preview splash page (#4581)
Browse files Browse the repository at this point in the history
  • Loading branch information
rtitle authored Jan 10, 2024
1 parent 67de4ea commit e014fda
Show file tree
Hide file tree
Showing 7 changed files with 1 addition and 163 deletions.
23 changes: 0 additions & 23 deletions src/auth/AuthContainer.test.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { act, getByTestId, screen } from '@testing-library/react';
import React from 'react';
import { isAzureUser } from 'src/auth/auth';
import AuthContainer from 'src/auth/AuthContainer';
import { Ajax } from 'src/libs/ajax';
import { Groups } from 'src/libs/ajax/Groups';
Expand All @@ -9,7 +8,6 @@ import { TermsOfService } from 'src/libs/ajax/TermsOfService';
import { User } from 'src/libs/ajax/User';
import { useRoute } from 'src/libs/nav';
import { AuthState, authStore } from 'src/libs/state';
import AzurePreview from 'src/pages/AzurePreview';
import { Disabled } from 'src/pages/Disabled';
import SignIn from 'src/pages/SignIn';
import { Register } from 'src/registration/Register';
Expand All @@ -35,7 +33,6 @@ jest.mock(
isAzureUser: jest.fn(),
})
);
jest.mock('src/pages/AzurePreview');
jest.mock('src/pages/Disabled');
jest.mock('src/pages/SignIn');
jest.mock('src/registration/Register');
Expand Down Expand Up @@ -227,24 +224,4 @@ describe('AuthContainer', () => {
screen.getByText('Child Page Content');
});
});
describe('when the user is an Azure User and has not seen the Azure Preview', () => {
it('shows the AzurePreview page', async () => {
// Arrange
await act(async () => {
authStore.update((state: AuthState) => ({ ...state, signInStatus: 'userLoaded' }));
});
asMockedFn(AzurePreview).mockImplementation(renderedPageFn);
asMockedFn(isAzureUser).mockImplementation(() => true);

// Act
render(
<AuthContainer>
<div />
</AuthContainer>
);

// Assert
expect(renderedPageFn).toHaveBeenCalled();
});
});
});
6 changes: 1 addition & 5 deletions src/auth/AuthContainer.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
import { ReactNode } from 'react';
import { h } from 'react-hyperscript-helpers';
import { isAzureUser } from 'src/auth/auth';
import { fixedSpinnerOverlay } from 'src/components/common';
import { useRoute } from 'src/libs/nav';
import { useStore } from 'src/libs/react-utils';
import { authStore, azurePreviewStore } from 'src/libs/state';
import { authStore } from 'src/libs/state';
import * as Utils from 'src/libs/utils';
import AzurePreview from 'src/pages/AzurePreview';
import { Disabled } from 'src/pages/Disabled';
import SignIn from 'src/pages/SignIn';
import { Register } from 'src/registration/Register';
Expand All @@ -21,13 +19,11 @@ const AuthContainer = ({ children }) => {
signInStatus === 'userLoaded' &&
terraUserAllowances.details.enabled === true &&
terraUserAllowances.details.termsOfService === false;
const seenAzurePreview = useStore(azurePreviewStore) || false;
const authspinner = () => fixedSpinnerOverlay;

return Utils.cond<ReactNode>(
[signInStatus === 'uninitialized' && !isPublic, authspinner],
[signInStatus === 'signedOut' && !isPublic, () => h(SignIn)],
[seenAzurePreview === false && isAzureUser(), () => h(AzurePreview)],
[userMustRegister, () => h(Register)],
[displayTosPage && name !== 'privacy', () => h(TermsOfServicePage)],
[userIsDisabled, () => h(Disabled)],
Expand Down
2 changes: 0 additions & 2 deletions src/auth/auth.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ import {
AuthState,
authStore,
azureCookieReadyStore,
azurePreviewStore,
cookieReadyStore,
getTerraUser,
MetricState,
Expand Down Expand Up @@ -110,7 +109,6 @@ export const signOut = (cause: SignOutCause = 'unspecified'): void => {
cookieReadyStore.reset();
azureCookieReadyStore.reset();
getSessionStorage().clear();
azurePreviewStore.set(false);

revokeTokens();

Expand Down
2 changes: 0 additions & 2 deletions src/libs/routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import * as DataBrowserDetails from 'src/data-catalog/DataBrowserDetails';
import * as DataBrowserPreview from 'src/data-catalog/DataBrowserPreview';
import * as ImportDataPage from 'src/import-data/ImportDataPage';
import { routeHandlersStore } from 'src/libs/state';
import * as AzurePreview from 'src/pages/AzurePreview';
import * as Projects from 'src/pages/billing/List/List';
import * as Environments from 'src/pages/EnvironmentsPage';
import * as FeaturePreviews from 'src/pages/FeaturePreviews';
Expand Down Expand Up @@ -84,7 +83,6 @@ const routes = _.flatten([
UploadData.navPaths,
FeaturePreviews.navPaths,
WorkspaceFiles.navPaths,
AzurePreview.navPaths,
WorkflowsApp.navPaths,
WorkspaceMigration.navPaths,
NotFound.navPaths, // must be last
Expand Down
3 changes: 0 additions & 3 deletions src/libs/state.ts
Original file line number Diff line number Diff line change
Expand Up @@ -249,9 +249,6 @@ lastActiveTimeStore.update((v) => v || {});
export const toggleStateAtom = staticStorageSlot(getSessionStorage(), 'toggleState');
toggleStateAtom.update((v) => v || { notebooksTab: true });

export const azurePreviewStore: Atom<boolean> = staticStorageSlot(getLocalStorage(), 'azurePreview');
azurePreviewStore.update((v) => v || false);

export const notificationStore = atom<any[]>([]);

export const contactUsActive = atom(false);
Expand Down
83 changes: 0 additions & 83 deletions src/pages/AzurePreview.js

This file was deleted.

45 changes: 0 additions & 45 deletions src/pages/AzurePreview.test.js

This file was deleted.

0 comments on commit e014fda

Please sign in to comment.