Merge branch 'develop' into feature/react-admin

resources/scripts/api/server/backups/createServerBackup.ts

@@ -2,12 +2,18 @@ import http from '@/api/http';
 import { ServerBackup } from '@/api/server/types';
 import { rawDataToServerBackup } from '@/api/transformers';
 
-export default (uuid: string, name?: string, ignored?: string): Promise<ServerBackup> => {
-    return new Promise((resolve, reject) => {
-        http.post(`/api/client/servers/${uuid}/backups`, {
-            name, ignored,
-        })
-            .then(({ data }) => resolve(rawDataToServerBackup(data)))
-            .catch(reject);
+interface RequestParameters {
+    name?: string;
+    ignored?: string;
+    isLocked: boolean;
+}
+
+export default async (uuid: string, params: RequestParameters): Promise<ServerBackup> => {
+    const { data } = await http.post(`/api/client/servers/${uuid}/backups`, {
+        name: params.name,
+        ignored: params.ignored,
+        is_locked: params.isLocked,
     });
+
+    return rawDataToServerBackup(data);
 };

resources/scripts/api/server/schedules/createOrUpdateSchedule.ts

@@ -1,20 +1,19 @@
 import { rawDataToServerSchedule, Schedule } from '@/api/server/schedules/getServerSchedules';
 import http from '@/api/http';
 
-type Data = Pick<Schedule, 'cron' | 'name' | 'isActive'> & { id?: number }
+type Data = Pick<Schedule, 'cron' | 'name' | 'onlyWhenOnline' | 'isActive'> & { id?: number }
 
-export default (uuid: string, schedule: Data): Promise<Schedule> => {
-    return new Promise((resolve, reject) => {
-        http.post(`/api/client/servers/${uuid}/schedules${schedule.id ? `/${schedule.id}` : ''}`, {
-            is_active: schedule.isActive,
-            name: schedule.name,
-            minute: schedule.cron.minute,
-            hour: schedule.cron.hour,
-            day_of_month: schedule.cron.dayOfMonth,
-            month: schedule.cron.month,
-            day_of_week: schedule.cron.dayOfWeek,
-        })
-            .then(({ data }) => resolve(rawDataToServerSchedule(data.attributes)))
-            .catch(reject);
+export default async (uuid: string, schedule: Data): Promise<Schedule> => {
+    const { data } = await http.post(`/api/client/servers/${uuid}/schedules${schedule.id ? `/${schedule.id}` : ''}`, {
+        is_active: schedule.isActive,
+        only_when_online: schedule.onlyWhenOnline,
+        name: schedule.name,
+        minute: schedule.cron.minute,
+        hour: schedule.cron.hour,
+        day_of_month: schedule.cron.dayOfMonth,
+        month: schedule.cron.month,
+        day_of_week: schedule.cron.dayOfWeek,
     });
+
+    return rawDataToServerSchedule(data.attributes);
 };

resources/scripts/api/server/schedules/createOrUpdateScheduleTask.ts

@@ -5,15 +5,16 @@ interface Data {
     action: string;
     payload: string;
     timeOffset: string | number;
+    continueOnFailure: boolean;
 }
 
-export default (uuid: string, schedule: number, task: number | undefined, { timeOffset, ...data }: Data): Promise<Task> => {
-    return new Promise((resolve, reject) => {
-        http.post(`/api/client/servers/${uuid}/schedules/${schedule}/tasks${task ? `/${task}` : ''}`, {
-            ...data,
-            time_offset: timeOffset,
-        })
-            .then(({ data }) => resolve(rawDataToServerTask(data.attributes)))
-            .catch(reject);
+export default async (uuid: string, schedule: number, task: number | undefined, data: Data): Promise<Task> => {
+    const { data: response } = await http.post(`/api/client/servers/${uuid}/schedules/${schedule}/tasks${task ? `/${task}` : ''}`, {
+        action: data.action,
+        payload: data.payload,
+        continue_on_failure: data.continueOnFailure,
+        time_offset: data.timeOffset,
     });
+
+    return rawDataToServerTask(response.attributes);
 };

resources/scripts/api/server/schedules/getServerSchedules.ts

@@ -12,6 +12,7 @@ export interface Schedule {
     };
     isActive: boolean;
     isProcessing: boolean;
+    onlyWhenOnline: boolean;
     lastRunAt: Date | null;
     nextRunAt: Date | null;
     createdAt: Date;
@@ -27,6 +28,7 @@ export interface Task {
     payload: string;
     timeOffset: number;
     isQueued: boolean;
+    continueOnFailure: boolean;
     createdAt: Date;
     updatedAt: Date;
 }
@@ -38,6 +40,7 @@ export const rawDataToServerTask = (data: any): Task => ({
     payload: data.payload,
     timeOffset: data.time_offset,
     isQueued: data.is_queued,
+    continueOnFailure: data.continue_on_failure,
     createdAt: new Date(data.created_at),
     updatedAt: new Date(data.updated_at),
 });
@@ -54,6 +57,7 @@ export const rawDataToServerSchedule = (data: any): Schedule => ({
     },
     isActive: data.is_active,
     isProcessing: data.is_processing,
+    onlyWhenOnline: data.only_when_online,
     lastRunAt: data.last_run_at ? new Date(data.last_run_at) : null,
     nextRunAt: data.next_run_at ? new Date(data.next_run_at) : null,
     createdAt: new Date(data.created_at),
@@ -62,14 +66,12 @@ export const rawDataToServerSchedule = (data: any): Schedule => ({
     tasks: (data.relationships?.tasks?.data || []).map((row: any) => rawDataToServerTask(row.attributes)),
 });
 
-export default (uuid: string): Promise<Schedule[]> => {
-    return new Promise((resolve, reject) => {
-        http.get(`/api/client/servers/${uuid}/schedules`, {
-            params: {
-                include: [ 'tasks' ],
-            },
-        })
-            .then(({ data }) => resolve((data.data || []).map((row: any) => rawDataToServerSchedule(row.attributes))))
-            .catch(reject);
+export default async (uuid: string): Promise<Schedule[]> => {
+    const { data } = await http.get(`/api/client/servers/${uuid}/schedules`, {
+        params: {
+            include: [ 'tasks' ],
+        },
     });
+
+    return (data.data || []).map((row: any) => rawDataToServerSchedule(row.attributes));
 };

resources/scripts/api/server/types.d.ts

@@ -3,6 +3,7 @@ export type ServerStatus = 'installing' | 'install_failed' | 'suspended' | 'rest
 export interface ServerBackup {
     uuid: string;
     isSuccessful: boolean;
+    isLocked: boolean;
     name: string;
     ignoredFiles: string;
     checksum: string;

resources/scripts/api/transformers.ts

@@ -58,6 +58,7 @@ export const rawDataToFileObject = (data: FractalResponseData): FileObject => ({
 export const rawDataToServerBackup = ({ attributes }: FractalResponseData): ServerBackup => ({
     uuid: attributes.uuid,
     isSuccessful: attributes.is_successful,
+    isLocked: attributes.is_locked,
     name: attributes.name,
     ignoredFiles: attributes.ignored_files,
     checksum: attributes.checksum,