Merge branch 'main' of https://github.com/oceanprotocol/market into f…

…eature/issue-1949-fix-file-input-low-connectivity

package.json

@@ -68,9 +68,9 @@
     "react-string-replace": "^1.1.0",
     "react-tabs": "^6.0.0",
     "react-toastify": "^9.1.2",
-    "remark": "^14.0.2",
+    "remark": "^15.0.1",
     "remark-gfm": "^4.0.0",
-    "remark-html": "^15.0.1",
+    "remark-html": "^16.0.1",
     "remove-markdown": "^0.5.0",
     "slugify": "^1.6.5",
     "swr": "^1.3.0",

src/@utils/assetConvertor.ts

@@ -1,6 +1,7 @@
 import { PublisherTrustedAlgorithm, Asset } from '@oceanprotocol/lib'
 import { AssetSelectionAsset } from '@shared/FormInput/InputElement/AssetSelection'
 import { getServiceByName } from './ddo'
+import normalizeUrl from 'normalize-url'
 
 export async function transformAssetToAssetSelection(
   datasetProviderEndpoint: string,
@@ -15,7 +16,8 @@ export async function transformAssetToAssetSelection(
 
     if (
       asset?.stats?.price?.value >= 0 &&
-      algoService?.serviceEndpoint === datasetProviderEndpoint
+      normalizeUrl(algoService?.serviceEndpoint) ===
+        normalizeUrl(datasetProviderEndpoint)
     ) {
       let selected = false
       selectedAlgorithms?.forEach((algorithm: PublisherTrustedAlgorithm) => {

src/@utils/compute.ts

@@ -167,7 +167,10 @@ export function getQueryString(
   const baseParams = {
     chainIds: [chainId],
     sort: { sortBy: SortTermOptions.Created },
-    filters: [getFilterTerm('metadata.type', 'algorithm')]
+    filters: [getFilterTerm('metadata.type', 'algorithm')],
+    esPaginationOptions: {
+      size: 3000
+    }
   } as BaseQueryParams
   algorithmDidList?.length > 0 &&
     baseParams.filters.push(getFilterTerm('_id', algorithmDidList))
@@ -200,7 +203,6 @@ export async function getAlgorithmsForAsset(
     ),
     token
   )
-
   const algorithms: Asset[] = gueryResults?.results
   return algorithms
 }

src/components/@shared/FormInput/index.tsx

@@ -72,11 +72,7 @@ export interface InputProps {
   disclaimerValues?: string[]
 }
 
-function checkError(
-  form: any,
-  parsedFieldName: string[],
-  field: FieldInputProps<any>
-) {
+function checkError(form: any, field: FieldInputProps<any>) {
   const touched = getObjectPropertyByPath(form?.touched, field?.name)
   const errors = getObjectPropertyByPath(form?.errors, field?.name)
 
@@ -85,7 +81,8 @@ function checkError(
     errors &&
     !field.name.endsWith('.files') &&
     !field.name.endsWith('.links') &&
-    !field.name.endsWith('consumerParameters')
+    !field.name.endsWith('consumerParameters') &&
+    !field.name.endsWith('.providerUrl')
   )
 }
 
@@ -109,7 +106,7 @@ export default function Input(props: Partial<InputProps>): ReactElement {
   // handling flat and nested data at same time.
   const parsedFieldName =
     isFormikField && (isNestedField ? field?.name.split('.') : [field?.name])
-  const hasFormikError = checkError(form, parsedFieldName, field)
+  const hasFormikError = checkError(form, field)
 
   const styleClasses = cx({
     field: true,

src/components/Asset/AssetActions/Compute/index.tsx

@@ -241,6 +241,7 @@ export default function Compute({
           asset.metadata.type
         )[0]
       )
+
       await setDatasetPrice(initializedProvider?.datasets?.[0]?.providerFee)
       setComputeStatusText(
         getComputeFeedback(

src/components/Publish/_validation.ts

@@ -31,24 +31,33 @@ const validationMetadata = {
   }),
   dockerImageCustomChecksum: Yup.string().when('type', {
     is: 'algorithm',
-    then: Yup.string().required('Required')
+    then: Yup.string().when('dockerImage', {
+      is: 'custom',
+      then: Yup.string().required('Required')
+    })
   }),
   dockerImageCustomEntrypoint: Yup.string().when('type', {
     is: 'algorithm',
-    then: Yup.string().required('Required')
+    then: Yup.string().when('dockerImage', {
+      is: 'custom',
+      then: Yup.string().required('Required')
+    })
   }),
   termsAndConditions: Yup.boolean()
     .required('Required')
     .isTrue('Please agree to the Terms and Conditions.'),
   usesConsumerParameters: Yup.boolean(),
-  consumerParameters: Yup.array().when('usesConsumerParameters', {
-    is: true,
-    then: Yup.array()
-      .of(Yup.object().shape(validationConsumerParameters))
-      .required('Required'),
-    otherwise: Yup.array()
-      .nullable()
-      .transform((value) => value || null)
+  consumerParameters: Yup.array().when('type', {
+    is: 'algorithm',
+    then: Yup.array().when('usesConsumerParameters', {
+      is: true,
+      then: Yup.array()
+        .of(Yup.object().shape(validationConsumerParameters))
+        .required('Required'),
+      otherwise: Yup.array()
+        .nullable()
+        .transform((value) => value || null)
+    })
   })
 }