Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: handle connected services in the admin panel #3329

Merged
merged 13 commits into from
Oct 3, 2024
Merged
Show file tree
Hide file tree
Changes from 6 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
1 change: 1 addition & 0 deletions client/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,7 @@
"papermill",
"pathname",
"pdfjs",
"pkce",
"plaintext",
"poller",
"popups",
Expand Down
173 changes: 173 additions & 0 deletions client/src/features/admin/AddConnectedServiceButton.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,173 @@
/*!
* Copyright 2024 - Swiss Data Science Center (SDSC)
* A partnership between École Polytechnique Fédérale de Lausanne (EPFL) and
* Eidgenössische Technische Hochschule Zürich (ETHZ).
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

import cx from "classnames";
import { useCallback, useEffect, useState } from "react";
import { PlusLg, XLg } from "react-bootstrap-icons";
import { Controller, useForm } from "react-hook-form";
import {
Button,
Form,
Input,
Label,
Modal,
ModalBody,
ModalFooter,
ModalHeader,
} from "reactstrap";
import {
ConnectedServiceForm,
CreateProviderParams,
} from "../connectedServices/connectedServices.types";
import { useCreateProviderMutation } from "../connectedServices/connectedServices.api";
import { RtkOrNotebooksError } from "../../components/errors/RtkErrorAlert";
import { Loader } from "../../components/Loader";
import ConnectedServiceFormContent from "./ConnectedServiceFormContent";

export default function AddConnectedServiceButton() {
const [isOpen, setIsOpen] = useState(false);
const toggle = useCallback(() => {
setIsOpen((open) => !open);
}, []);

return (
<>
<Button className="btn-outline-rk-green" onClick={toggle}>
<PlusLg className={cx("bi", "me-1")} />
Add Session Environment
lorenzo-cavazzi marked this conversation as resolved.
Show resolved Hide resolved
</Button>
<AddConnectedServiceModal isOpen={isOpen} toggle={toggle} />
</>
);
}

interface AddConnectedServiceModalProps {
isOpen: boolean;
toggle: () => void;
}
function AddConnectedServiceModal({
isOpen,
toggle,
}: AddConnectedServiceModalProps) {
const [createProvider, result] = useCreateProviderMutation();

const {
control,
formState: { errors },
handleSubmit,
reset,
} = useForm<ConnectedServiceForm>({
defaultValues: {
id: "",
kind: "gitlab",
client_id: "",
client_secret: "",
display_name: "",
scope: "",
url: "",
use_pkce: false,
},
});
const onSubmit = useCallback(
(data: CreateProviderParams) => {
createProvider({
id: data.id,
kind: data.kind,
client_id: data.client_id,
client_secret: data.client_secret,
display_name: data.display_name,
scope: data.scope,
url: data.url,
use_pkce: data.use_pkce,
});
},
[createProvider]
);

useEffect(() => {
if (!result.isSuccess) {
return;
}
toggle();
}, [result.isSuccess, toggle]);

useEffect(() => {
if (!isOpen) {
reset();
result.reset();
}
}, [isOpen, reset, result]);

return (
<Modal
backdrop="static"
centered
fullscreen="lg"
isOpen={isOpen}
size="lg"
toggle={toggle}
>
<Form
className="form-rk-green"
noValidate
onSubmit={handleSubmit(onSubmit)}
>
<ModalHeader toggle={toggle}>Add provider</ModalHeader>
<ModalBody>
{result.error && <RtkOrNotebooksError error={result.error} />}

<div className="mb-3">
<Label className="form-label" for="addConnectedServiceId">
Id
</Label>
<Controller
control={control}
name="id"
render={({ field }) => (
<Input
className={cx("form-control", errors.id && "is-invalid")}
id="addConnectedServiceId"
placeholder="Provider id"
type="text"
{...field}
/>
)}
rules={{ required: true }}
/>
</div>

<ConnectedServiceFormContent control={control} errors={errors} />
</ModalBody>
<ModalFooter>
<Button className="btn-outline-rk-green" onClick={toggle}>
<XLg className={cx("bi", "me-1")} />
Cancel
</Button>
<Button disabled={result.isLoading} type="submit">
{result.isLoading ? (
<Loader className="me-1" inline size={16} />
) : (
<PlusLg className={cx("bi", "me-1")} />
)}
Add provider
</Button>
</ModalFooter>
</Form>
</Modal>
);
}
6 changes: 4 additions & 2 deletions client/src/features/admin/AdminPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -62,22 +62,24 @@ import { ResourcePoolUser } from "./adminComputeResources.types";
import { useGetKeycloakUserQuery } from "./adminKeycloak.api";
import { KeycloakUser } from "./adminKeycloak.types";
import useKeycloakRealm from "./useKeycloakRealm.hook";
import ConnectedServicesSection from "./ConnectedServicesSection";

export default function AdminPage() {
return (
<>
<h1 className={cx("fs-2", "mb-3")}>Admin Panel</h1>
<IncidentsAndMaintenanceSection />
<ComputeResourcesSection />
<ConnectedServicesSection />
<SessionEnvironmentsSection />
</>
);
}

function ComputeResourcesSection() {
return (
<section>
<h2 className="fs-5">Compute Resources</h2>
<section className="mt-4">
<h2 className="fs-4">Compute Resources</h2>
<AdminComputeResourcesOverview />
</section>
);
Expand Down
Loading
Loading