From 2c5fb9bd40f85feeddbb5a2833f617e0d54b6cf9 Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Wed, 1 Jul 2020 19:02:31 +0200 Subject: [PATCH] metadata reset --- .../molecules/PublishForm/PublishForm.tsx | 2 -- src/models/Asset.ts | 3 --- src/models/PublishForm.ts | 22 ++----------------- tests/unit/__fixtures__/ddo.ts | 3 --- 4 files changed, 2 insertions(+), 28 deletions(-) diff --git a/src/components/molecules/PublishForm/PublishForm.tsx b/src/components/molecules/PublishForm/PublishForm.tsx index db33395e0..2fc0daf1d 100644 --- a/src/components/molecules/PublishForm/PublishForm.tsx +++ b/src/components/molecules/PublishForm/PublishForm.tsx @@ -78,8 +78,6 @@ export function transformPublishFormToMetadata( copyrightHolder: holder, tags: keywords?.split(','), termsAndConditions, - supportName, - supportEmail, access: access || 'Download' }, // ------- curation ------- diff --git a/src/models/Asset.ts b/src/models/Asset.ts index 076b77c72..608310fbc 100644 --- a/src/models/Asset.ts +++ b/src/models/Asset.ts @@ -19,11 +19,8 @@ const AssetModel: MetaDataMarket = { // links: [], // custom items - deliveryType: 'files', termsAndConditions: false, dateRange: undefined, - supportName: undefined, - supportEmail: undefined, access: 'Download' }, curation: { diff --git a/src/models/PublishForm.ts b/src/models/PublishForm.ts index bd837d20f..1a54c66e3 100644 --- a/src/models/PublishForm.ts +++ b/src/models/PublishForm.ts @@ -3,7 +3,7 @@ import { JSONSchema6 } from 'json-schema' import TermsWidget from '../components/atoms/FormWidgets/TermsWidget' import DateRangeWidget from '../components/atoms/FormWidgets/DateRangeWidget' import { ObjectFieldTemplate } from '../components/molecules/Form/ObjectFieldTemplate' -import { Granularity, AccessType } from '../@types/MetaData' +import { AccessType } from '../@types/MetaData' import FileField from '../components/molecules/Form/FileField' export const customWidgets = { @@ -98,15 +98,6 @@ export const PublishFormSchema: JSONSchema6 = { type: 'string', title: 'Keywords' }, - supportName: { - type: 'string', - title: 'Support Name' - }, - supportEmail: { - type: 'string', - format: 'email', - title: 'Support Email Address' - }, termsAndConditions: { type: 'boolean', title: 'I agree to these Terms and Conditions' @@ -181,8 +172,6 @@ export interface PublishFormDataInterface { dateRange?: string holder?: string keywords?: string - supportEmail?: string - supportName?: string } // Ref: https://github.com/oceanprotocol/OEPs/blob/master/8/v0.4/README.md#main-attributes export const publishFormData: PublishFormDataInterface = { @@ -195,12 +184,5 @@ export const publishFormData: PublishFormDataInterface = { termsAndConditions: false, dateRange: undefined, holder: undefined, - keywords: undefined, - supportName: undefined, - supportEmail: undefined + keywords: undefined } -/* -Missing fields: -links: [] - -*/ diff --git a/tests/unit/__fixtures__/ddo.ts b/tests/unit/__fixtures__/ddo.ts index 45703a970..e84457bd9 100644 --- a/tests/unit/__fixtures__/ddo.ts +++ b/tests/unit/__fixtures__/ddo.ts @@ -71,11 +71,8 @@ const ddo: Partial = { url: 'https://demo.com' } ], - deliveryType: 'files', termsAndConditions: true, dateRange: ['2018-09-20T08:38:58', '2019-12-11T05:19:42'], - supportName: 'Jelly McJellyfish', - supportEmail: 'jelly@oceanprotocol.com', access: 'Download' }, curation: {