Skip to content

Commit b551e5b

Browse files
MillenniumFalconMechanicMillenniumFalconMechanic
authored
feat: added check login required for hca export/download #4292 (#4394)
1 parent 0a7d938 commit b551e5b

File tree

6 files changed

+66
-51
lines changed

6 files changed

+66
-51
lines changed

‎app/components/Detail/components/GeneratedMatricesTables/components/FileLocationCopy/fileLocationCopy.tsx‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { ButtonGroupButton } from "@databiosphere/findable-ui/lib/components/common/ButtonGroup/components/ButtonGroupButton/buttonGroupButton";
22
import { ContentCopyIconSmall } from "@databiosphere/findable-ui/lib/components/common/CustomIcon/common/constants";
33
import { useFileLocation } from "@databiosphere/findable-ui/lib/hooks/useFileLocation";
4+
import { useLoginGuard } from "@databiosphere/findable-ui/lib/providers/loginGuard/hook";
45
import copy from "copy-to-clipboard";
56
import { useEffect } from "react";
67
import { ProjectMatrixView } from "../../../../../../viewModelBuilders/azul/hca-dcp/common/projectMatrixMapper/entities";
@@ -15,6 +16,9 @@ export const FileLocationCopy = ({
1516
const { url } = projectMatrixView;
1617
const { fileUrl, isLoading, isSuccess, run } = useFileLocation(url);
1718

19+
// Prompt user for login before download, if required.
20+
const { requireLogin } = useLoginGuard();
21+
1822
useEffect(() => {
1923
if (fileUrl && isSuccess) {
2024
copy(fileUrl);
@@ -26,7 +30,7 @@ export const FileLocationCopy = ({
2630
action="Copy project matrix"
2731
label={<ContentCopyIconSmall />}
2832
loading={isLoading}
29-
onClick={run}
33+
onClick={() => requireLogin(run)}
3034
/>
3135
);
3236
};

‎app/components/Detail/components/GeneratedMatricesTables/components/FileLocationDownload/fileLocationDownload.tsx‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { FileDownloadButton } from "@databiosphere/findable-ui/lib/components/co
22
import { ButtonGroupButton } from "@databiosphere/findable-ui/lib/components/common/ButtonGroup/components/ButtonGroupButton/buttonGroupButton";
33
import { DownloadIconSmall } from "@databiosphere/findable-ui/lib/components/common/CustomIcon/common/constants";
44
import { useFileLocation } from "@databiosphere/findable-ui/lib/hooks/useFileLocation";
5+
import { useLoginGuard } from "@databiosphere/findable-ui/lib/providers/loginGuard/hook";
56
import { ProjectMatrixView } from "../../../../../../viewModelBuilders/azul/hca-dcp/common/projectMatrixMapper/entities";
67

78
export interface FileLocationDownloadProps {
@@ -13,13 +14,17 @@ export const FileLocationDownload = ({
1314
}: FileLocationDownloadProps): JSX.Element => {
1415
const { fileName, url } = projectMatrixView;
1516
const { fileUrl, isLoading, run } = useFileLocation(url);
17+
18+
// Prompt user for login before download, if required.
19+
const { requireLogin } = useLoginGuard();
20+
1621
return (
1722
<>
1823
<ButtonGroupButton
1924
action="Download project matrix"
2025
label={<DownloadIconSmall />}
2126
loading={isLoading}
22-
onClick={run}
27+
onClick={() => requireLogin(run)}
2328
/>
2429
<FileDownloadButton fileName={fileName} fileUrl={fileUrl} />
2530
</>

‎package-lock.json‎

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"check-system-status:anvil-cmg": "esrun e2e/anvil/anvil-check-system-status.ts"
3333
},
3434
"dependencies": {
35-
"@databiosphere/findable-ui": "21.3.0",
35+
"@databiosphere/findable-ui": "21.4.0",
3636
"@emotion/react": "^11.13.3",
3737
"@emotion/styled": "^11.13.0",
3838
"@mdx-js/loader": "^3.0.1",

‎pages/_app.tsx‎

Lines changed: 44 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import { ExploreStateProvider } from "@databiosphere/findable-ui/lib/providers/e
1515
import { FileManifestStateProvider } from "@databiosphere/findable-ui/lib/providers/fileManifestState";
1616
import { GoogleSignInAuthenticationProvider } from "@databiosphere/findable-ui/lib/providers/googleSignInAuthentication/provider";
1717
import { LayoutStateProvider } from "@databiosphere/findable-ui/lib/providers/layoutState";
18+
import { LoginGuardProvider } from "@databiosphere/findable-ui/lib/providers/loginGuard/provider";
1819
import { SystemStatusProvider } from "@databiosphere/findable-ui/lib/providers/systemStatus";
1920
import { createAppTheme } from "@databiosphere/findable-ui/lib/theme/theme";
2021
import { DataExplorerError } from "@databiosphere/findable-ui/lib/types/error";
@@ -75,47 +76,49 @@ function MyApp({ Component, pageProps }: AppPropsWithComponent): JSX.Element {
7576
SessionController={TerraProfileProvider}
7677
timeout={SESSION_TIMEOUT}
7778
>
78-
<LayoutStateProvider>
79-
<AppLayout>
80-
<ThemeProvider
81-
theme={(theme: Theme): Theme =>
82-
createTheme(
83-
deepmerge(theme, {
84-
breakpoints: createBreakpoints(BREAKPOINTS),
85-
})
86-
)
87-
}
88-
>
89-
<Header {...header} />
90-
</ThemeProvider>
91-
<ExploreStateProvider entityListType={entityListType}>
92-
<FileManifestStateProvider>
93-
<Main>
94-
<ErrorBoundary
95-
fallbackRender={({
96-
error,
97-
reset,
98-
}: {
99-
error: DataExplorerError;
100-
reset: () => void;
101-
}): JSX.Element => (
102-
<Error
103-
errorMessage={error.message}
104-
requestUrlMessage={error.requestUrlMessage}
105-
rootPath={redirectRootToPath}
106-
onReset={reset}
107-
/>
108-
)}
109-
>
110-
<Component {...pageProps} />
111-
<Floating {...floating} />
112-
</ErrorBoundary>
113-
</Main>
114-
</FileManifestStateProvider>
115-
</ExploreStateProvider>
116-
<Footer {...footer} />
117-
</AppLayout>
118-
</LayoutStateProvider>
79+
<LoginGuardProvider>
80+
<LayoutStateProvider>
81+
<AppLayout>
82+
<ThemeProvider
83+
theme={(theme: Theme): Theme =>
84+
createTheme(
85+
deepmerge(theme, {
86+
breakpoints: createBreakpoints(BREAKPOINTS),
87+
})
88+
)
89+
}
90+
>
91+
<Header {...header} />
92+
</ThemeProvider>
93+
<ExploreStateProvider entityListType={entityListType}>
94+
<FileManifestStateProvider>
95+
<Main>
96+
<ErrorBoundary
97+
fallbackRender={({
98+
error,
99+
reset,
100+
}: {
101+
error: DataExplorerError;
102+
reset: () => void;
103+
}): JSX.Element => (
104+
<Error
105+
errorMessage={error.message}
106+
requestUrlMessage={error.requestUrlMessage}
107+
rootPath={redirectRootToPath}
108+
onReset={reset}
109+
/>
110+
)}
111+
>
112+
<Component {...pageProps} />
113+
<Floating {...floating} />
114+
</ErrorBoundary>
115+
</Main>
116+
</FileManifestStateProvider>
117+
</ExploreStateProvider>
118+
<Footer {...footer} />
119+
</AppLayout>
120+
</LayoutStateProvider>
121+
</LoginGuardProvider>
119122
</GoogleSignInAuthenticationProvider>
120123
</SystemStatusProvider>
121124
</DXConfigProvider>

‎site-config/hca-dcp/cc-ma-dev/config.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ export function makeManagedAccessConfig(config: SiteConfig): SiteConfig {
3333
// Add authentication to the config.
3434
cloneConfig.authentication = getAuthenticationConfig();
3535

36+
// Require authentication for exports
37+
cloneConfig.exportsRequireAuth = true;
38+
3639
// Update categoryGroupConfig.
3740
cloneConfig.categoryGroupConfig = getMACategoryGroupConfig(
3841
cloneConfig.categoryGroupConfig

0 commit comments

Comments
 (0)