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

Feature/create child system #353

Merged
merged 2 commits into from
Feb 29, 2024
Merged
Show file tree
Hide file tree
Changes from all 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
21 changes: 21 additions & 0 deletions src/tapis-api/systems/createChildSystem.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import { Systems } from '@tapis/tapis-typescript';
import { apiGenerator, errorDecoder } from 'tapis-api/utils';

const createChildSystem = (
reqPostChildSystem: Systems.ReqPostChildSystem,
parentId: string,
basePath: string,
jwt: string
) => {
const api: Systems.ChildSystemsApi = apiGenerator<Systems.ChildSystemsApi>(
Systems,
Systems.ChildSystemsApi,
basePath,
jwt
);
return errorDecoder<Systems.RespBasic>(() =>
api.createChildSystem({ reqPostChildSystem, parentId })
);
};

export default createChildSystem;
1 change: 1 addition & 0 deletions src/tapis-api/systems/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ export { default as deleteSystem } from './deleteSystem';
export { default as undeleteSystem } from './undeleteSystem';
export { default as shareSystemPublic } from './shareSystemPublic';
export { default as unShareSystemPublic } from './unShareSystemPublic';
export { default as createChildSystem } from './createChildSystem';
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
.modal-settings {
max-height: 38rem;
overflow-y: scroll;
}

.item {
border: 1px dotted lightgray;
padding: 0.5em 0.5em 0.5em 0.5em;
margin-bottom: 1em;
}

.array {
border: 1px solid gray;
padding: 0.5em 0.5em 0.5em 0.5em;
margin-bottom: 0.5em;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
import { Button } from 'reactstrap';
import { GenericModal } from 'tapis-ui/_common';
import { SubmitWrapper } from 'tapis-ui/_wrappers';
import { ToolbarModalProps } from '../SystemLayoutToolbar';
import { Form, Formik } from 'formik';
import { FormikInput } from 'tapis-ui/_common';
import { useTapisConfig } from 'tapis-hooks';
import { useCreateChildSystem } from 'tapis-hooks/systems';
import { useEffect } from 'react';
import { useLocation } from 'react-router-dom';
import styles from './CreateChildSystemModal.module.scss';
import * as Yup from 'yup';

const CreateChildSystemModal: React.FC<ToolbarModalProps> = ({ toggle }) => {
const { isLoading, isSuccess, error, reset, createChildSystem } =
useCreateChildSystem();

useEffect(() => {
reset();
}, [reset]);

const validationSchema = Yup.object({
sysname: Yup.string()
.min(1)
.max(80, 'System name should not be longer than 80 characters')
.matches(
/^[a-zA-Z0-9_.-]+$/,
"Must contain only alphanumeric characters and the following: '.', '_', '-'"
)
.required('System name is a required field'),
rootDir: Yup.string()
.min(1)
.max(4096, 'Root Directory should not be longer than 4096 characters'),
effectiveUserId: Yup.string()
.max(60, 'Effective User ID should not be longer than 60 characters')
.required('Effective User ID is a required field'),
parentId: Yup.string().required('Parent ID is a required field'),
});

const initialValues = {
sysname: '',
rootDir: '/',
effectiveUserId: useTapisConfig().claims['tapis/username'],
parentId: String(useLocation().pathname.split('/').pop()),
};

const onSubmit = ({
sysname,
rootDir,
effectiveUserId,
parentId,
}: {
sysname: string;
rootDir: string;
effectiveUserId: string;
parentId: string;
}) => {
createChildSystem(
{
id: sysname,
effectiveUserId,
rootDir,
},
parentId
);
};

return (
<GenericModal
toggle={toggle}
title="Create New Child System"
body={
<div className={styles['modal-settings']}>
<Formik
initialValues={initialValues}
validationSchema={validationSchema}
onSubmit={onSubmit}
>
{() => (
<Form id="newsystem-form">
<FormikInput
name="sysname"
label="System Name"
required={true}
description={`System Name`}
aria-label="Input"
/>
<FormikInput
name="effectiveUserId"
label="Effective User ID"
required={true}
description={`Effective User ID`}
aria-label="Input"
/>
<FormikInput
name="rootDir"
label="Root Directory"
required={true}
description={`Root Directory`}
aria-label="Input"
/>
</Form>
)}
</Formik>
</div>
}
footer={
<SubmitWrapper
className={styles['modal-footer']}
isLoading={isLoading}
error={error}
success={isSuccess ? `Successfully created a new child system` : ''}
reverse={true}
>
<Button
form="newsystem-form"
color="primary"
disabled={isLoading || isSuccess}
aria-label="Submit"
type="submit"
>
Create a new child system
</Button>
</SubmitWrapper>
}
/>
);
};

export default CreateChildSystemModal;
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import CreateChildSystemModal from './CreateChildSystemModal';

export default CreateChildSystemModal;
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import styles from './SystemLayoutToolbar.module.scss';
import { useLocation } from 'react-router-dom';
import ShareSystemPublicModal from './ShareSystemPublicModal';
import UnShareSystemPublicModal from './UnShareSystemPublicModal';
import CreateChildSystemModal from './CreateChildSystemModal';

type ToolbarButtonProps = {
text: string;
Expand Down Expand Up @@ -64,13 +65,22 @@ const SystemLayoutToolbar: React.FC = () => {
onClick={() => setModal('unsharesystempublic')}
aria-label="unShareSystemPublic"
/>

<ToolbarButton
text="Create Child System"
icon="add"
disabled={false}
onClick={() => setModal('ConfirmModal-CreateChildSystem')}
aria-label="unShareSystemPublic"
/>
{modal === 'sharesystempublic' && (
<ShareSystemPublicModal toggle={toggle} />
)}
{modal === 'unsharesystempublic' && (
<UnShareSystemPublicModal toggle={toggle} />
)}
{modal === 'ConfirmModal-CreateChildSystem' && (
<CreateChildSystemModal toggle={toggle} />
)}
</div>
)}
</div>
Expand Down
1 change: 1 addition & 0 deletions src/tapis-hooks/systems/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ export { default as useDeleteSystem } from './useDeleteSystem';
export { default as useUndeleteSystem } from './useUndeleteSystem';
export { default as useShareSystemPublic } from './useShareSystemPublic';
export { default as useUnShareSystemPublic } from './useUnShareSystemPublic';
export { default as useCreateChildSystem } from './useCreateChildSystem';
1 change: 1 addition & 0 deletions src/tapis-hooks/systems/queryKeys.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ const QueryKeys = {
deleteSystem: 'systems/deleteSystem',
shareSystemPublic: 'systems/shareSystemPublic',
unShareSystemPublic: 'systems/unShareSystemPublic',
createChildSystem: 'systems/createChildSystem',
};

export default QueryKeys;
40 changes: 40 additions & 0 deletions src/tapis-hooks/systems/useCreateChildSystem.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
import { useMutation, MutateOptions } from 'react-query';
import { Systems } from '@tapis/tapis-typescript';
import { createChildSystem } from 'tapis-api/systems';
import { useTapisConfig } from '../context';
import QueryKeys from './queryKeys';

type createChildSystemParams = {
reqPostChildSystem: Systems.ReqPostChildSystem;
parentId: string;
};

const useCreateChildSystem = () => {
const { basePath, accessToken } = useTapisConfig();
const jwt = accessToken?.access_token || '';

const { mutate, isLoading, isError, isSuccess, data, error, reset } =
useMutation<Systems.RespBasic, Error, createChildSystemParams>(
[QueryKeys.createChildSystem, basePath, jwt],
({ reqPostChildSystem, parentId }) =>
createChildSystem(reqPostChildSystem, parentId, basePath, jwt)
);

return {
isLoading,
isError,
isSuccess,
data,
error,
reset,
createChildSystem: (
reqPostChildSystem: Systems.ReqPostChildSystem,
parentId: string,
options?: MutateOptions<Systems.RespBasic, Error, createChildSystemParams>
) => {
return mutate({ reqPostChildSystem, parentId }, options);
},
};
};

export default useCreateChildSystem;
4 changes: 3 additions & 1 deletion src/tapis-ui/_common/ConfirmModal/ConfirmModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { SubmitWrapper } from 'tapis-ui/_wrappers';

type ConfirmModalProps = {
toggle: () => void;
title?: string;
message?: string;
onConfirm: () => void;
isLoading: boolean;
Expand All @@ -15,6 +16,7 @@ type ConfirmModalProps = {

const ConfirmModal: React.FC<ConfirmModalProps> = ({
toggle,
title,
message,
onConfirm,
isLoading,
Expand All @@ -25,7 +27,7 @@ const ConfirmModal: React.FC<ConfirmModalProps> = ({
return (
<GenericModal
toggle={toggle}
title="Confirm"
title={title || 'Confirm'}
body={message || 'Are you sure you want to continue?'}
footer={
<SubmitWrapper
Expand Down
Loading