From 6813462cb0f5f4b162b2a471fd07c0bca7ff235c Mon Sep 17 00:00:00 2001 From: ClaudiaHolhos Date: Mon, 13 Dec 2021 17:23:29 +0200 Subject: [PATCH 1/6] use new provider --- package-lock.json | 1 + src/@utils/provider.ts | 32 +++++++++++++++---- .../@shared/FormFields/Provider/index.tsx | 5 ++- 3 files changed, 29 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 57b0726e1..8ca9c98c3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -108,6 +108,7 @@ } }, "../ocean.js": { + "name": "@oceanprotocol/lib", "version": "1.0.0-alpha", "license": "Apache-2.0", "dependencies": { diff --git a/src/@utils/provider.ts b/src/@utils/provider.ts index ebc9d3692..889558238 100644 --- a/src/@utils/provider.ts +++ b/src/@utils/provider.ts @@ -1,5 +1,5 @@ import axios, { CancelToken, AxiosResponse } from 'axios' -import { DID, LoggerInstance } from '@oceanprotocol/lib' +import { LoggerInstance, ProviderInstance } from '@oceanprotocol/lib' export interface FileMetadata { index: number @@ -31,15 +31,12 @@ export async function getEncryptedFileUrls( } export async function getFileInfo( - url: string | DID, + url: string, providerUrl: string, cancelToken: CancelToken ): Promise { - let postBody try { - if (url instanceof DID) postBody = { did: url.getDid() } - else postBody = { url } - + const postBody = { url } const response: AxiosResponse = await axios.post( `${providerUrl}/api/v1/services/fileinfo`, postBody, @@ -56,3 +53,26 @@ export async function getFileInfo( } } } + +export async function fetchMethod(url: string): Promise { + const result = await axios.get(url) + if (!result) { + console.error(`Error requesting ${url}`) + console.error(`Response message: \n${result}`) + throw result + } + return result +} + +export async function isValidProvider(url: string): Promise { + try { + const response = await ProviderInstance.isValidProvider( + url, + fetchMethod(url) + ) + return response + } catch (error) { + console.error(`Error validating provider: ${error.message}`) + return false + } +} diff --git a/src/components/@shared/FormFields/Provider/index.tsx b/src/components/@shared/FormFields/Provider/index.tsx index 87da3abdd..1b6fbcd8a 100644 --- a/src/components/@shared/FormFields/Provider/index.tsx +++ b/src/components/@shared/FormFields/Provider/index.tsx @@ -1,24 +1,23 @@ import React, { ReactElement, useState } from 'react' import { ErrorMessage, useField } from 'formik' import UrlInput from '../URLInput' -import { useOcean } from '@context/Ocean' import { InputProps } from '@shared/FormInput' import FileInfo from '../FilesInput/Info' import styles from './index.module.css' import Button from '@shared/atoms/Button' import { initialValues } from 'src/components/Publish/_constants' +import { isValidProvider } from '@utils/provider' export default function CustomProvider(props: InputProps): ReactElement { const [field, meta, helpers] = useField(props.name) const [isLoading, setIsLoading] = useState(false) - const { ocean, config } = useOcean() async function validateProvider(url: string) { setIsLoading(true) try { // TODO: #948 Remove ocean.provider.isValidProvider dependency. - const isValid = await ocean.provider.isValidProvider(url) + const isValid = await isValidProvider(url) helpers.setValue({ url, valid: isValid }) helpers.setError(undefined) } catch (error) { From 1669df0e780c92c0d000b0df0e97d302ef07cbae Mon Sep 17 00:00:00 2001 From: ClaudiaHolhos Date: Mon, 13 Dec 2021 17:41:22 +0200 Subject: [PATCH 2/6] lint fix --- src/@hooks/useConsume.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/@hooks/useConsume.ts b/src/@hooks/useConsume.ts index 6faf86ac5..9b501538f 100644 --- a/src/@hooks/useConsume.ts +++ b/src/@hooks/useConsume.ts @@ -1,7 +1,6 @@ import { useState } from 'react' import { consumeFeedback } from '@utils/feedback' import { LoggerInstance } from '@oceanprotocol/lib' -import { useOcean } from '@context/Ocean' import { useWeb3 } from '@context/Web3' interface UseConsume { @@ -66,7 +65,7 @@ function useConsume(): UseConsume { // null, // false // ) - // LoggerInstance.log('order created', orderId) + // LoggerInstance.log('ordercreated', orderId) // setStep(2) // } catch (error) { // setConsumeError(error.message) From e028dd9674e18c7b1213f393a25dd8e425ab7a27 Mon Sep 17 00:00:00 2001 From: ClaudiaHolhos Date: Tue, 14 Dec 2021 14:59:16 +0200 Subject: [PATCH 3/6] working check --- src/@utils/provider.ts | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/@utils/provider.ts b/src/@utils/provider.ts index 889558238..d0a2210cb 100644 --- a/src/@utils/provider.ts +++ b/src/@utils/provider.ts @@ -54,11 +54,11 @@ export async function getFileInfo( } } -export async function fetchMethod(url: string): Promise { - const result = await axios.get(url) +async function fetchMethod(url: string): Promise { + const result = await fetch(url) if (!result) { - console.error(`Error requesting ${url}`) - console.error(`Response message: \n${result}`) + LoggerInstance.error(`Error requesting ${url}`) + LoggerInstance.error(`Response message: \n${result}`) throw result } return result @@ -66,10 +66,7 @@ export async function fetchMethod(url: string): Promise { export async function isValidProvider(url: string): Promise { try { - const response = await ProviderInstance.isValidProvider( - url, - fetchMethod(url) - ) + const response = await ProviderInstance.isValidProvider(url, fetchMethod) return response } catch (error) { console.error(`Error validating provider: ${error.message}`) From 62ced13eaf3de1fa4fc249a4d4bf3cb47facff7b Mon Sep 17 00:00:00 2001 From: ClaudiaHolhos Date: Wed, 15 Dec 2021 13:10:11 +0200 Subject: [PATCH 4/6] remove fetchMehod() --- src/@utils/provider.ts | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/@utils/provider.ts b/src/@utils/provider.ts index d0a2210cb..bb6c47386 100644 --- a/src/@utils/provider.ts +++ b/src/@utils/provider.ts @@ -54,19 +54,9 @@ export async function getFileInfo( } } -async function fetchMethod(url: string): Promise { - const result = await fetch(url) - if (!result) { - LoggerInstance.error(`Error requesting ${url}`) - LoggerInstance.error(`Response message: \n${result}`) - throw result - } - return result -} - export async function isValidProvider(url: string): Promise { try { - const response = await ProviderInstance.isValidProvider(url, fetchMethod) + const response = await ProviderInstance.isValidProvider(url, fetch) return response } catch (error) { console.error(`Error validating provider: ${error.message}`) From 5050621e28fd3a0268b799dfff5ee91aec730e7f Mon Sep 17 00:00:00 2001 From: ClaudiaHolhos Date: Mon, 10 Jan 2022 12:13:53 +0200 Subject: [PATCH 5/6] isValidUrl called directly, extra function removed --- src/@utils/provider.ts | 10 ---------- src/components/@shared/FormFields/Provider/index.tsx | 5 ++--- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/src/@utils/provider.ts b/src/@utils/provider.ts index bb6c47386..7c6097fcc 100644 --- a/src/@utils/provider.ts +++ b/src/@utils/provider.ts @@ -53,13 +53,3 @@ export async function getFileInfo( } } } - -export async function isValidProvider(url: string): Promise { - try { - const response = await ProviderInstance.isValidProvider(url, fetch) - return response - } catch (error) { - console.error(`Error validating provider: ${error.message}`) - return false - } -} diff --git a/src/components/@shared/FormFields/Provider/index.tsx b/src/components/@shared/FormFields/Provider/index.tsx index 1b6fbcd8a..f3f1609ad 100644 --- a/src/components/@shared/FormFields/Provider/index.tsx +++ b/src/components/@shared/FormFields/Provider/index.tsx @@ -6,7 +6,7 @@ import FileInfo from '../FilesInput/Info' import styles from './index.module.css' import Button from '@shared/atoms/Button' import { initialValues } from 'src/components/Publish/_constants' -import { isValidProvider } from '@utils/provider' +import { ProviderInstance } from '@oceanprotocol/lib' export default function CustomProvider(props: InputProps): ReactElement { const [field, meta, helpers] = useField(props.name) @@ -16,8 +16,7 @@ export default function CustomProvider(props: InputProps): ReactElement { setIsLoading(true) try { - // TODO: #948 Remove ocean.provider.isValidProvider dependency. - const isValid = await isValidProvider(url) + const isValid = await ProviderInstance.isValidProvider(url, fetch) helpers.setValue({ url, valid: isValid }) helpers.setError(undefined) } catch (error) { From e716f96d673369d1e4dcdf59bb7bdece644a6064 Mon Sep 17 00:00:00 2001 From: ClaudiaHolhos Date: Mon, 10 Jan 2022 13:06:07 +0200 Subject: [PATCH 6/6] removed unused import --- src/@utils/provider.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/@utils/provider.ts b/src/@utils/provider.ts index 7c6097fcc..e3c9a92cd 100644 --- a/src/@utils/provider.ts +++ b/src/@utils/provider.ts @@ -1,5 +1,5 @@ import axios, { CancelToken, AxiosResponse } from 'axios' -import { LoggerInstance, ProviderInstance } from '@oceanprotocol/lib' +import { LoggerInstance } from '@oceanprotocol/lib' export interface FileMetadata { index: number