Skip to content

Commit b22bcfc

Browse files
authored
fix extractor bugs and deployment script bug (#958)
1 parent 5f55c40 commit b22bcfc

File tree

4 files changed

+14
-18
lines changed

4 files changed

+14
-18
lines changed

deployments/kubernetes/charts/clowder2/templates/backend/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ spec:
6969
- name: auth_client_id
7070
value: {{ .Values.auth.clientID }}
7171
- name: auth_redirect_uri
72-
value: $(CLOWDER2_URL)/api/v2/auth
72+
value: $(CLOWDER2_URL)/api/v2/auth
7373
- name: auth_url
7474
value: $(CLOWDER2_URL)/keycloak/realms/clowder/protocol/openid-connect/auth?client_id=clowder2-backend&response_type=code
7575
- name: oauth2_scheme_auth_url

frontend/src/actions/file.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -349,6 +349,7 @@ export function submitFileExtractionAction(fileId, extractorName, requestBody) {
349349
return V2.FilesService.postFileExtractApiV2FilesFileIdExtractPost(
350350
fileId,
351351
extractorName,
352+
null,
352353
requestBody
353354
)
354355
.then((json) => {

frontend/src/components/Public.tsx

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React, { ChangeEvent, useEffect, useState } from "react";
2-
import {Box, Button, Grid, Link, Pagination, Tab, Tabs} from "@mui/material";
2+
import { Box, Button, Grid, Link, Pagination, Tab, Tabs } from "@mui/material";
33

44
import { RootState } from "../types/data";
55
import { useDispatch, useSelector } from "react-redux";
@@ -100,11 +100,12 @@ export const Public = (): JSX.Element => {
100100
})
101101
) : (
102102
<Box>
103-
<p>No public datasets available. <Link href="/auth/login">
104-
Login
105-
</Link> or <Link href="/auth/register">
106-
register
107-
</Link> to create datasets. </p>
103+
<p>
104+
No public datasets available.{" "}
105+
<Link href="/auth/login">Login</Link> or{" "}
106+
<Link href="/auth/register">register</Link> to create
107+
datasets.{" "}
108+
</p>
108109
</Box>
109110
)}
110111
</Grid>
Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,10 @@
11
import React from "react";
2-
import {useSelector} from "react-redux";
3-
import {RootState} from "../../types/data";
4-
5-
2+
import { useSelector } from "react-redux";
3+
import { RootState } from "../../types/data";
64

75
export const AuthWrapper = (props): JSX.Element => {
8-
const {currRole, allowedRoles, children} = props;
6+
const { currRole, allowedRoles, children } = props;
97
const adminMode = useSelector((state: RootState) => state.user.adminMode);
108

11-
return (
12-
<>
13-
{(adminMode || allowedRoles.includes(currRole)) ? children : <></>}
14-
</>
15-
);
16-
}
9+
return <>{adminMode || allowedRoles.includes(currRole) ? children : <></>}</>;
10+
};

0 commit comments

Comments
 (0)