Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2352 from Sir3lit/bugfixes

Browse source 
Fix schedule layout
This commit is contained in:
Dane Everitt 2020-09-17 14:27:20 -07:00 committed by GitHub
commit f420cd1354
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 40 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources/scripts/components/server/schedules/ScheduleTaskRow.tsx
View file

@ -81,7 +81,7 @@ export default ({ schedule, task }: Props) => {
<div css={tw`md:ml-6 mt-2`}> <div css={tw`md:ml-6 mt-2`}>
{task.action === 'backup' && {task.action === 'backup' &&
<p css={tw`text-xs uppercase text-neutral-400 mb-1`}>Ignoring files & folders:</p>} <p css={tw`text-xs uppercase text-neutral-400 mb-1`}>Ignoring files & folders:</p>}
<div css={tw`font-mono bg-neutral-800 rounded py-1 px-2 text-sm w-auto whitespace-pre inline-block`}> <div css={tw`font-mono bg-neutral-800 rounded py-1 px-2 text-sm w-auto whitespace-pre inline-block break-all`}>
{task.payload} {task.payload}
</div> </div>
</div> </div>

33
resources/scripts/components/server/schedules/TaskDetailsModal.tsx
View file

@ -57,13 +57,22 @@ const TaskDetailsForm = ({ isEditingTask }: { isEditingTask: boolean }) => {
</FormikField> </FormikField>
</FormikFieldWrapper> </FormikFieldWrapper>
</div> </div>
<div css={tw`flex-1`}> <div css={tw`flex-1 ml-6`}>
{action === 'command' ?
<Field <Field
name={'payload'} name={'timeOffset'}
label={'Payload'} label={'Time offset (in seconds)'}
description={'The command to send to the server when this task executes.'} description={'The amount of time to wait after the previous task executes before running this one. If this is the first task on a schedule this will not be applied.'}
/> />
</div>
</div>
<div css={tw`mt-6`}>
{action === 'command' ?
<div>
<Label>Payload</Label>
<FormikFieldWrapper name={'payload'}>
<FormikField as={Textarea} name={'payload'} rows={6} />
</FormikFieldWrapper>
</div>
: :
action === 'power' ? action === 'power' ?
<div> <div>
@ -84,19 +93,11 @@ const TaskDetailsForm = ({ isEditingTask }: { isEditingTask: boolean }) => {
name={'payload'} name={'payload'}
description={'Optional. Include the files and folders to be excluded in this backup. By default, the contents of your .pteroignore file will be used.'} description={'Optional. Include the files and folders to be excluded in this backup. By default, the contents of your .pteroignore file will be used.'}
> >
<FormikField as={Textarea} name={'payload'} rows={6}/> <FormikField as={Textarea} name={'payload'} rows={6} />
</FormikFieldWrapper> </FormikFieldWrapper>
</div> </div>
} }
</div> </div>
</div>
<div css={tw`mt-6`}>
<Field
name={'timeOffset'}
label={'Time offset (in seconds)'}
description={'The amount of time to wait after the previous task executes before running this one. If this is the first task on a schedule this will not be applied.'}
/>
</div>
<div css={tw`flex justify-end mt-6`}> <div css={tw`flex justify-end mt-6`}>
<Button type={'submit'} disabled={isSubmitting}> <Button type={'submit'} disabled={isSubmitting}>
{isEditingTask ? 'Save Changes' : 'Create Task'} {isEditingTask ? 'Save Changes' : 'Create Task'}
@ -162,8 +163,8 @@ export default ({ task, schedule, onDismissed }: Props) => {
onDismissed={() => onDismissed()} onDismissed={() => onDismissed()}
showSpinnerOverlay={isSubmitting} showSpinnerOverlay={isSubmitting}
> >
<FlashMessageRender byKey={'schedule:task'} css={tw`mb-4`}/> <FlashMessageRender byKey={'schedule:task'} css={tw`mb-4`} />
<TaskDetailsForm isEditingTask={typeof task !== 'undefined'}/> <TaskDetailsForm isEditingTask={typeof task !== 'undefined'} />
</Modal> </Modal>
)} )}
</Formik> </Formik>