Schedule Fixes

Limiting Schedule name 75>255
Moved Payload to bottom of new task window
Closes pterodactyl#2346

Author: notAreYouScared

app/Models/Schedule.php

@@ -103,7 +103,7 @@ class Schedule extends Model
      */
     public static $validationRules = [
         'server_id' => 'required|exists:servers,id',
-        'name' => 'nullable|string|max:255',
+        'name' => 'nullable|string|max:75',
         'cron_day_of_week' => 'required|string',
         'cron_day_of_month' => 'required|string',
         'cron_hour' => 'required|string',

resources/scripts/components/server/schedules/ScheduleTaskRow.tsx

@@ -81,7 +81,7 @@ export default ({ schedule, task }: Props) => {
                 <div css={tw`md:ml-6 mt-2`}>
                     {task.action === 'backup' &&
                     <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 inline-block break-all`}>
                         {task.payload}
                     </div>
                 </div>

resources/scripts/components/server/schedules/TaskDetailsModal.tsx

@@ -57,45 +57,46 @@ const TaskDetailsForm = ({ isEditingTask }: { isEditingTask: boolean }) => {
                         </FormikField>
                     </FormikFieldWrapper>
                 </div>
-                <div css={tw`flex-1`}>
-                    {action === 'command' ?
-                        <Field
-                            name={'payload'}
-                            label={'Payload'}
-                            description={'The command to send to the server when this task executes.'}
-                        />
-                        :
-                        action === 'power' ?
-                            <div>
-                                <Label>Payload</Label>
-                                <FormikFieldWrapper name={'payload'}>
-                                    <FormikField as={Select} name={'payload'}>
-                                        <option value={'start'}>Start the server</option>
-                                        <option value={'restart'}>Restart the server</option>
-                                        <option value={'stop'}>Stop the server</option>
-                                        <option value={'kill'}>Terminate the server</option>
-                                    </FormikField>
-                                </FormikFieldWrapper>
-                            </div>
-                            :
-                            <div>
-                                <Label>Ignored Files</Label>
-                                <FormikFieldWrapper
-                                    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.'}
-                                >
-                                    <FormikField as={Textarea} name={'payload'} css={tw`h-32`}/>
-                                </FormikFieldWrapper>
-                            </div>
-                    }
+                <div css={tw`flex-1 ml-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>
             <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.'}
-                />
+                {action === 'command' ?
+                    <div>
+                        <Label>Payload</Label>
+                        <FormikFieldWrapper name={'payload'}>
+                            <FormikField as={Textarea} name={'payload'} rows={6} />
+                        </FormikFieldWrapper>
+                    </div>
+                    :
+                    action === 'power' ?
+                        <div>
+                            <Label>Payload</Label>
+                            <FormikFieldWrapper name={'payload'}>
+                                <FormikField as={Select} name={'payload'}>
+                                    <option value={'start'}>Start the server</option>
+                                    <option value={'restart'}>Restart the server</option>
+                                    <option value={'stop'}>Stop the server</option>
+                                    <option value={'kill'}>Terminate the server</option>
+                                </FormikField>
+                            </FormikFieldWrapper>
+                        </div>
+                        :
+                        <div>
+                            <Label>Ignored Files</Label>
+                            <FormikFieldWrapper
+                                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.'}
+                            >
+                                <FormikField as={Textarea} name={'payload'} rows={6} />
+                            </FormikFieldWrapper>
+                        </div>
+                }
             </div>
             <div css={tw`flex justify-end mt-6`}>
                 <Button type={'submit'} disabled={isSubmitting}>
@@ -162,8 +163,8 @@ export default ({ task, schedule, onDismissed }: Props) => {
                     onDismissed={() => onDismissed()}
                     showSpinnerOverlay={isSubmitting}
                 >
-                    <FlashMessageRender byKey={'schedule:task'} css={tw`mb-4`}/>
-                    <TaskDetailsForm isEditingTask={typeof task !== 'undefined'}/>
+                    <FlashMessageRender byKey={'schedule:task'} css={tw`mb-4`} />
+                    <TaskDetailsForm isEditingTask={typeof task !== 'undefined'} />
                 </Modal>
             )}
         </Formik>