[Human App] fix: oracle discovery schema (#2819)

* fix: oracle discovery schema

* fix: use proper oracle type from response

Author: dnechay

packages/apps/human-app/frontend/src/api/services/worker/oracles.ts

@@ -7,7 +7,7 @@ import { useJobsTypesOraclesFilter } from '@/hooks/use-job-types-oracles-table';
 import { stringifyUrlQueryObject } from '@/shared/helpers/stringify-url-query-object';
 import { env } from '@/shared/env';
 
-const OracleSuccessSchema = z.object({
+const OracleSchema = z.object({
   address: z.string(),
   role: z.string(),
   url: z.string(),
@@ -16,12 +16,14 @@ const OracleSuccessSchema = z.object({
   registrationInstructions: z.string().optional().nullable(),
 });
 
-const OraclesSuccessSchema = z.array(OracleSuccessSchema);
+const OraclesDiscoverSuccessSchema = z.object({
+  oracles: z.array(OracleSchema),
+  chainIdsEnabled: z.array(z.string()),
+});
 
-export type OracleSuccessResponse = z.infer<typeof OracleSuccessSchema> & {
+export type Oracle = z.infer<typeof OracleSchema> & {
   name: string;
 };
-export type OraclesSuccessResponse = OracleSuccessResponse[];
 
 const OracleNameToUrls = {
   CVAT: [
@@ -38,7 +40,7 @@ for (const [oracleName, oracleUrls] of Object.entries(OracleNameToUrls)) {
   }
 }
 
-const H_CAPTCHA_ORACLE: OracleSuccessResponse = {
+const H_CAPTCHA_ORACLE: Oracle = {
   address: env.VITE_H_CAPTCHA_ORACLE_ADDRESS,
   jobTypes: env.VITE_H_CAPTCHA_ORACLE_TASK_TYPES,
   role: env.VITE_H_CAPTCHA_ORACLE_ROLE,
@@ -60,17 +62,17 @@ export async function getOracles({
       ? `?${stringifyUrlQueryObject({ selected_job_types })}`
       : '';
 
-    const fetchedOracles = await apiClient(
+    const result = await apiClient(
       `${apiPaths.worker.oracles.path}${queryParams}`,
       {
-        successSchema: OraclesSuccessSchema,
+        successSchema: OraclesDiscoverSuccessSchema,
         options: { method: 'GET' },
       },
       signal
     );
 
     oracles = oracles.concat(
-      fetchedOracles.map((oracle) => ({
+      result.oracles.map((oracle) => ({
         ...oracle,
         name: oracleUrlToNameMap.get(oracle.url) ?? '',
       }))

packages/apps/human-app/frontend/src/pages/worker/jobs-discovery/components/oracles-table/oracles-table-mobile.tsx

@@ -8,7 +8,7 @@ import { EvmAddress } from '@/pages/worker/jobs/components/evm-address';
 import { ListItem } from '@/components/ui/list-item';
 import { useColorMode } from '@/hooks/use-color-mode';
 import type { JobType } from '@/smart-contracts/EthKVStore/config';
-import type { OracleSuccessResponse } from '@/api/services/worker/oracles';
+import type { Oracle } from '@/api/services/worker/oracles';
 import { NoRecords } from '@/components/ui/no-records';
 
 export function OraclesTableMobile({
@@ -19,7 +19,7 @@ export function OraclesTableMobile({
     isPending: isOraclesDataPending,
   },
 }: {
-  selectOracle: (oracle: OracleSuccessResponse, jobTypes: string[]) => void;
+  selectOracle: (oracle: Oracle, jobTypes: string[]) => void;
   oraclesQueryDataResult: OraclesDataQueryResult;
 }) {
   const { colorPalette } = useColorMode();

packages/apps/human-app/frontend/src/pages/worker/jobs-discovery/components/oracles-table/oracles-table.tsx

@@ -6,7 +6,7 @@ import {
 } from 'material-react-table';
 import { Grid } from '@mui/material';
 import { useNavigate } from 'react-router-dom';
-import { type OracleSuccessResponse } from '@/api/services/worker/oracles';
+import type { Oracle } from '@/api/services/worker/oracles';
 import { useIsMobile } from '@/hooks/use-is-mobile';
 import { EvmAddress } from '@/pages/worker/jobs/components/evm-address';
 import { Chips } from '@/components/ui/chips';
@@ -22,8 +22,8 @@ import { type JobType } from '@/smart-contracts/EthKVStore/config';
 import { useGetRegistrationInExchangeOracles } from '@/api/services/worker/get-registration-in-exchange-oracles';
 
 const getColumns = (
-  selectOracle: (oracle: OracleSuccessResponse) => void
-): MRT_ColumnDef<OracleSuccessResponse>[] => {
+  selectOracle: (oracle: Oracle) => void
+): MRT_ColumnDef<Oracle>[] => {
   return [
     {
       accessorKey: 'name',
@@ -91,7 +91,7 @@ export function OraclesTable({
   const { data: registrationInExchangeOraclesResult } =
     useGetRegistrationInExchangeOracles();
 
-  const selectOracle = (oracle: OracleSuccessResponse) => {
+  const selectOracle = (oracle: Oracle) => {
     if (
       oracle.registrationNeeded &&
       !registrationInExchangeOraclesResult?.oracle_addresses.find(

packages/apps/human-app/frontend/src/pages/worker/jobs-discovery/jobs-discovery.page.tsx

@@ -6,13 +6,13 @@ import { useEffect, useRef } from 'react';
 import { useIsMobile } from '@/hooks/use-is-mobile';
 import { OraclesTable } from '@/pages/worker/jobs-discovery/components/oracles-table/oracles-table';
 import { OraclesTableJobTypesSelect } from '@/pages/worker/jobs-discovery/components/oracles-table/oracles-table-job-types-select';
-import type { OraclesSuccessResponse } from '@/api/services/worker/oracles';
+import type { Oracle } from '@/api/services/worker/oracles';
 import { useGetOracles } from '@/api/services/worker/oracles';
 import { useAuthenticatedUser } from '@/auth/use-authenticated-user';
 import { routerPaths } from '@/router/router-paths';
 import { useGetOraclesNotifications } from '@/hooks/use-get-oracles-notifications';
 
-export type OraclesDataQueryResult = UseQueryResult<OraclesSuccessResponse>;
+export type OraclesDataQueryResult = UseQueryResult<Oracle[]>;
 
 export function JobsDiscoveryPage() {
   const { onError } = useGetOraclesNotifications();