Skip to content

Commit c67be49

Browse files
romanowskaromanowska
authored
Remove terms and conditions from About page and Landing page footer (#1039)
1 parent 2a16337 commit c67be49

File tree

6 files changed

+31
-126
lines changed

6 files changed

+31
-126
lines changed

‎web_ui/src/core/const.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,4 @@ export const IMPORT_DATASET_LEARN_MORE =
77
export const DOCS_BASE_URL =
88
'https://github.com/open-edge-platform/datumaro/tree/develop/docs/source/docs/data-formats/formats';
99
export const CONTACT_SUPPORT = 'https://supporttickets.intel.com/supportrequest?lang=en-US&productId=233385:15548';
10-
export const TERMS_OF_USE_INTEL = 'https://www.intel.com/content/www/us/en/legal/terms-of-use.html';
11-
export const PRIVACY_NOTICE = 'https://www.intel.com/content/www/us/en/privacy/intel-privacy-notice.html';
12-
export const COOKIES_NOTICE = 'https://www.intel.com/content/www/us/en/privacy/intel-cookie-notice.html';
1310
export const TERMS_OF_USE_GETI = 'https://docs.geti.intel.com/eula/';

‎web_ui/src/pages/about-page/about-page.component.test.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@ describe('About page', () => {
5252
jest.mocked(useIsSaasEnv).mockReturnValue(true);
5353
render(<AboutPage />);
5454

55-
expect(screen.queryByRole('button', { name: 'License' })).not.toBeInTheDocument();
55+
expect(screen.queryByRole('button', { name: 'Geti License' })).not.toBeInTheDocument();
5656
});
5757

58-
it('Shows and hides license modal when clicking the License button in on-prem environments', () => {
58+
it('Shows and hides license modal when clicking the Geti License button in on-prem environments', () => {
5959
jest.mocked(useIsSaasEnv).mockReturnValue(false);
6060
render(<AboutPage />);
6161

62-
const licenseButton = screen.getByRole('button', { name: 'License' });
62+
const licenseButton = screen.getByRole('button', { name: 'Geti License' });
6363
expect(licenseButton).toBeInTheDocument();
6464

6565
// License modal should not be visible initially

‎web_ui/src/pages/about-page/about-page.component.tsx‎

Lines changed: 19 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ import { useState } from 'react';
55

66
import { useProductInfo } from '@geti/core/src/platform-utils/hooks/use-platform-utils.hook';
77
import { ActionButton, Flex, Heading, Link as SpectrumLink, Text, View } from '@geti/ui';
8-
import { Link } from 'react-router-dom';
98

10-
import { COOKIES_NOTICE, PRIVACY_NOTICE, TERMS_OF_USE_GETI, TERMS_OF_USE_INTEL } from '../../core/const';
9+
import { TERMS_OF_USE_GETI } from '../../core/const';
1110
import { useIsSaasEnv } from '../../hooks/use-is-saas-env/use-is-saas-env.hook';
1211
import { LicenseModal } from '../../shared/components/license-modal/license-modal.component';
1312
import { PageLayout } from '../../shared/components/page-layout/page-layout.component';
@@ -36,43 +35,25 @@ const AboutPage = (): JSX.Element => {
3635
labor-intensive tasks, enables collaborative model development, and speeds up model creation.
3736
</Text>
3837
<Flex direction={'column'} UNSAFE_className={classes.legalInformation}>
39-
<Heading level={3}>©{new Date().getFullYear()} Intel Corporation</Heading>
40-
<SpectrumLink UNSAFE_className={classes.link}>
41-
<Link to={TERMS_OF_USE_INTEL} target={'_blank'} rel={'noopener noreferrer'}>
42-
Terms of use
43-
</Link>
44-
</SpectrumLink>
45-
<SpectrumLink UNSAFE_className={classes.link}>
46-
<Link to={COOKIES_NOTICE} target={'_blank'} rel={'noopener noreferrer'}>
47-
Cookies
48-
</Link>
49-
</SpectrumLink>
50-
<SpectrumLink UNSAFE_className={classes.link}>
51-
<Link to={PRIVACY_NOTICE} target={'_blank'} rel={'noopener noreferrer'}>
52-
Privacy
53-
</Link>
54-
</SpectrumLink>
38+
<Heading level={3} marginBottom={'size-100'}>
39+
©{new Date().getFullYear()} Intel Corporation
40+
</Heading>
5541

56-
<>
57-
<Heading level={3} UNSAFE_className={classes.heading}>
58-
Geti
59-
</Heading>
60-
{isSaasEnvironment ? (
61-
<SpectrumLink UNSAFE_className={classes.link}>
62-
<a href={TERMS_OF_USE_GETI} target={'_blank'} rel={'noopener noreferrer'}>
63-
Terms of use & Privacy
64-
</a>
65-
</SpectrumLink>
66-
) : (
67-
<ActionButton
68-
isQuiet
69-
UNSAFE_className={classes.licenceButton}
70-
onPress={() => setForceOpenLicenseModal(true)}
71-
>
72-
License
73-
</ActionButton>
74-
)}
75-
</>
42+
{isSaasEnvironment ? (
43+
<SpectrumLink UNSAFE_className={classes.link}>
44+
<a href={TERMS_OF_USE_GETI} target={'_blank'} rel={'noopener noreferrer'}>
45+
Terms of use & Privacy
46+
</a>
47+
</SpectrumLink>
48+
) : (
49+
<ActionButton
50+
isQuiet
51+
UNSAFE_className={classes.licenceButton}
52+
onPress={() => setForceOpenLicenseModal(true)}
53+
>
54+
Geti License
55+
</ActionButton>
56+
)}
7657

7758
{!isSaasEnvironment && data?.buildVersion && (
7859
<Text marginTop={'size-400'} id={'build-version-id'}>

‎web_ui/src/pages/landing-page/landing-page-sidebar/landing-page-sidebar.component.tsx‎

Lines changed: 9 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33

44
import { paths } from '@geti/core';
55
import { useFeatureFlags } from '@geti/core/src/feature-flags/hooks/use-feature-flags.hook';
6-
import { Divider, Flex, Link as SpectrumLink, useMediaQuery, View } from '@geti/ui';
7-
import { InfoOutline, Policy, ProjectsIcon, UserIcon } from '@geti/ui/icons';
6+
import { Flex, useMediaQuery, View } from '@geti/ui';
7+
import { InfoOutline, ProjectsIcon, UserIcon } from '@geti/ui/icons';
88
import { isLargeSizeQuery } from '@geti/ui/theme';
9-
import { Link } from 'react-router-dom';
109

1110
import { useFirstWorkspaceIdentifier } from '../../../providers/workspaces-provider/use-first-workspace-identifier.hook';
1211
import { MenuItemImage } from '../../../shared/components/menu-item-image/menu-item-image.component';
@@ -17,8 +16,6 @@ import { idMatchingFormat } from '../../../test-utils/id-utils';
1716
import { OrganizationsPicker } from './organizations-picker/organizations-picker.component';
1817
import { StorageUsage } from './storage-usage/storage-usage.component';
1918

20-
import classes from './landing-page-sidebar.module.scss';
21-
2219
enum LandingPageMenuOptions {
2320
PROJECTS = 'Projects',
2421
ACCOUNT = 'Account',
@@ -79,29 +76,13 @@ export const LandingPageSidebar = (): JSX.Element => {
7976
<OrganizationsPicker isLargeSize={isLargeSize} />
8077
<SidebarMenu options={options} id={'landing-page'} />
8178
</View>
82-
<Flex direction={'column'} width={'100%'} gap={isLargeSize ? 'size-150' : 'size-100'}>
83-
<ShowForOnPrem>{FEATURE_FLAG_STORAGE_SIZE_COMPUTATION && <StorageUsage />}</ShowForOnPrem>
84-
<Divider size='S' UNSAFE_className={classes.sidebarDivider} />
85-
{isLargeSize ? (
86-
<Flex UNSAFE_className={classes.sidebarFooter}>
87-
<SpectrumLink UNSAFE_className={classes.footerLink}>
88-
<Link to={paths.organization.about({ organizationId })} viewTransition>
89-
Terms of use <Divider size={'S'} orientation={'vertical'} /> Privacy
90-
</Link>
91-
</SpectrumLink>
92-
</Flex>
93-
) : (
94-
<Flex UNSAFE_className={`${classes.sidebarFooter} ${classes.mobile}`}>
95-
<Link
96-
to={paths.organization.about({ organizationId })}
97-
viewTransition
98-
className={classes.footerLink}
99-
>
100-
<Policy width={18} height={18} aria-label='Terms of use' />
101-
</Link>
102-
</Flex>
103-
)}
104-
</Flex>
79+
{FEATURE_FLAG_STORAGE_SIZE_COMPUTATION && (
80+
<View marginBottom={'size-600'}>
81+
<ShowForOnPrem>
82+
<StorageUsage />
83+
</ShowForOnPrem>
84+
</View>
85+
)}
10586
</Flex>
10687
</Flex>
10788
);

‎web_ui/src/pages/landing-page/landing-page-sidebar/landing-page-sidebar.module.scss‎

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎web_ui/src/pages/landing-page/landing-page-sidebar/landing-page.sidebar.test.tsx‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Copyright (C) 2022-2025 Intel Corporation
22
// LIMITED EDGE SOFTWARE DISTRIBUTION LICENSE
33

4-
import { paths } from '@geti/core';
54
import { screen, within } from '@testing-library/react';
65

76
import { providersRender } from '../../../test-utils/required-providers-render';
@@ -28,17 +27,4 @@ describe('Landing page - sidebar', () => {
2827
])
2928
);
3029
});
31-
32-
it('Should should show terms of use and privacy', async () => {
33-
providersRender(<LandingPageSidebar />);
34-
35-
expect(screen.getByText(/Terms of use/)).toBeInTheDocument();
36-
expect(screen.getByText(/Privacy/)).toBeInTheDocument();
37-
38-
expect(
39-
screen.getByRole('link', {
40-
name: /terms of use privacy/i,
41-
})
42-
).toHaveAttribute('href', paths.organization.about({ organizationId: 'organization-id' }));
43-
});
4430
});

0 commit comments

Comments
 (0)