estela-web: Handle updated response format when deleting data

bitmakerla · Dec 14, 2023 · 8af58b1 · 8af58b1
1 parent 5d014c1
commit 8af58b1
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 79 deletions.
diff --git a/estela-web/src/pages/JobDataListPage/index.tsx b/estela-web/src/pages/JobDataListPage/index.tsx
@@ -4,11 +4,7 @@ import { RouteComponentProps } from "react-router-dom";
 
 import "./styles.scss";
 import { ApiService } from "../../services";
-import {
-    ApiProjectsSpidersJobsDataListRequest,
-    ApiProjectsSpidersJobsDataDeleteRequest,
-    DeleteJobData,
-} from "../../services/api";
+import { ApiProjectsSpidersJobsDataListRequest, ApiProjectsSpidersJobsDataDeleteRequest } from "../../services/api";
 import { resourceNotAllowedNotification, dataDeletedNotification, Spin } from "../../shared";
 
 const { Content } = Layout;
@@ -59,9 +55,9 @@ export class JobDataListPage extends Component<RouteComponentProps<RouteParams>,
             type: this.type,
         };
         this.apiService.apiProjectsSpidersJobsDataDelete(request).then(
-            (response: DeleteJobData) => {
+            () => {
                 this.setState({ data: [], count: 0, current: 0, loaded: true });
-                dataDeletedNotification(response.count);
+                dataDeletedNotification();
             },
             (error: unknown) => {
                 error;

diff --git a/estela-web/src/pages/JobDataPage/index.tsx b/estela-web/src/pages/JobDataPage/index.tsx
@@ -11,7 +11,6 @@ import {
     ApiProjectsSpidersJobsDataListRequest,
     ApiProjectsSpidersJobsDataDeleteRequest,
     ApiProjectsSpidersJobsDataDownloadRequest,
-    DeleteJobData,
     InlineResponse2006,
     InlineResponse2008,
 } from "../../services/api";
@@ -43,8 +42,8 @@ const deleteSpiderJobData = (type_: string, projectId: string, spiderId: string,
         type: type_,
     };
     return apiService.apiProjectsSpidersJobsDataDelete(request).then(
-        (response: DeleteJobData) => {
-            dataDeletedNotification(response.count);
+        () => {
+            dataDeletedNotification();
             return true;
         },
         (error: unknown) => {
@@ -656,6 +655,7 @@ export function JobLogsData({ projectId, spiderId, jobId }: JobsDataProps) {
     const [count, setCount] = useState(0);
     const [loaded, setLoaded] = useState(false);
     const [logs, setLogs] = useState<Dictionary[]>([]);
+
     useEffect(() => {
         getData("logs", 1, projectId, spiderId, jobId).then((response) => {
             let data: Dictionary[] = [];

diff --git a/estela-web/src/services/api/generated-api/.openapi-generator/FILES b/estela-web/src/services/api/generated-api/.openapi-generator/FILES
@@ -6,7 +6,6 @@ models/Activity.ts
 models/AuthToken.ts
 models/ChangePassword.ts
 models/CoverageStats.ts
-models/DeleteJobData.ts
 models/Deploy.ts
 models/DeployCreate.ts
 models/DeployUpdate.ts

diff --git a/estela-web/src/services/api/generated-api/apis/ApiApi.ts b/estela-web/src/services/api/generated-api/apis/ApiApi.ts
@@ -21,9 +21,6 @@ import {
     ChangePassword,
     ChangePasswordFromJSON,
     ChangePasswordToJSON,
-    DeleteJobData,
-    DeleteJobDataFromJSON,
-    DeleteJobDataToJSON,
     Deploy,
     DeployFromJSON,
     DeployToJSON,
@@ -2071,7 +2068,7 @@ export class ApiApi extends runtime.BaseAPI {
 
     /**
      */
-    async apiProjectsSpidersJobsDataDeleteRaw(requestParameters: ApiProjectsSpidersJobsDataDeleteRequest): Promise<runtime.ApiResponse<DeleteJobData>> {
+    async apiProjectsSpidersJobsDataDeleteRaw(requestParameters: ApiProjectsSpidersJobsDataDeleteRequest): Promise<runtime.ApiResponse<void>> {
         if (requestParameters.jid === null || requestParameters.jid === undefined) {
             throw new runtime.RequiredError('jid','Required parameter requestParameters.jid was null or undefined when calling apiProjectsSpidersJobsDataDelete.');
         }
@@ -2106,14 +2103,13 @@ export class ApiApi extends runtime.BaseAPI {
             query: queryParameters,
         });
 
-        return new runtime.JSONApiResponse(response, (jsonValue) => DeleteJobDataFromJSON(jsonValue));
+        return new runtime.VoidApiResponse(response);
     }
 
     /**
      */
-    async apiProjectsSpidersJobsDataDelete(requestParameters: ApiProjectsSpidersJobsDataDeleteRequest): Promise<DeleteJobData> {
-        const response = await this.apiProjectsSpidersJobsDataDeleteRaw(requestParameters);
-        return await response.value();
+    async apiProjectsSpidersJobsDataDelete(requestParameters: ApiProjectsSpidersJobsDataDeleteRequest): Promise<void> {
+        await this.apiProjectsSpidersJobsDataDeleteRaw(requestParameters);
     }
 
     /**

diff --git a/estela-web/src/services/api/generated-api/models/DeleteJobData.ts b/estela-web/src/services/api/generated-api/models/DeleteJobData.ts
diff --git a/estela-web/src/services/api/generated-api/models/SpiderJobUpdate.ts b/estela-web/src/services/api/generated-api/models/SpiderJobUpdate.ts
@@ -67,6 +67,12 @@ export interface SpiderJobUpdate {
      * @memberof SpiderJobUpdate
      */
     dataExpiryDays?: number;
+    /**
+     * Proxy Usage data.
+     * @type {string}
+     * @memberof SpiderJobUpdate
+     */
+    proxyUsageData?: string;
 }
 
 /**
@@ -108,6 +114,7 @@ export function SpiderJobUpdateFromJSONTyped(json: any, ignoreDiscriminator: boo
         'requestCount': !exists(json, 'request_count') ? undefined : json['request_count'],
         'dataStatus': !exists(json, 'data_status') ? undefined : json['data_status'],
         'dataExpiryDays': !exists(json, 'data_expiry_days') ? undefined : json['data_expiry_days'],
+        'proxyUsageData': !exists(json, 'proxy_usage_data') ? undefined : json['proxy_usage_data'],
     };
 }
 
@@ -127,6 +134,7 @@ export function SpiderJobUpdateToJSON(value?: SpiderJobUpdate | null): any {
         'request_count': value.requestCount,
         'data_status': value.dataStatus,
         'data_expiry_days': value.dataExpiryDays,
+        'proxy_usage_data': value.proxyUsageData,
     };
 }
 

diff --git a/estela-web/src/services/api/generated-api/models/index.ts b/estela-web/src/services/api/generated-api/models/index.ts
@@ -2,7 +2,6 @@ export * from './Activity';
 export * from './AuthToken';
 export * from './ChangePassword';
 export * from './CoverageStats';
-export * from './DeleteJobData';
 export * from './Deploy';
 export * from './DeployCreate';
 export * from './DeployUpdate';

diff --git a/estela-web/src/shared/notifications/index.tsx b/estela-web/src/shared/notifications/index.tsx
@@ -18,10 +18,10 @@ export const resourceNotAllowedNotification = (): void => {
     history.push("/");
 };
 
-export const dataDeletedNotification = (n: number): void => {
+export const dataDeletedNotification = (): void => {
     notification.open({
         message: "Data Successfully Deleted",
-        description: `${n} Items have been deleted`,
+        description: "All items have been deleted",
     });
 };