From be005e0936fed78272ffc4f0243714d003ffc0b3 Mon Sep 17 00:00:00 2001
From: mihaisc <mihai.scarlat@smartcontrol.ro>
Date: Tue, 27 Oct 2020 13:56:43 +0200
Subject: [PATCH 1/3] remove license

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
---
 content/pages/publish.json                    | 28 -------------------
 src/@types/MetaData.d.ts                      |  2 --
 .../organisms/AssetContent/MetaFull.tsx       | 10 +------
 src/components/pages/Publish/utils.ts         |  5 +---
 src/models/FormPublish.ts                     |  3 --
 5 files changed, 2 insertions(+), 46 deletions(-)

diff --git a/content/pages/publish.json b/content/pages/publish.json
index 484846398..e50d1a4d1 100644
--- a/content/pages/publish.json
+++ b/content/pages/publish.json
@@ -54,40 +54,12 @@
         "help": "Give proper attribution for your data set.",
         "required": true
       },
-      {
-        "name": "copyrightHolder",
-        "label": "Copyright Holder",
-        "placeholder": "e.g. Marine Institute of Jellyfish",
-        "help": "Add this if the holder of the copyright is different from the author."
-      },
       {
         "name": "tags",
         "label": "Tags",
         "placeholder": "e.g. logistics, ai",
         "help": "Separate tags with comma."
       },
-      {
-        "name": "license",
-        "label": "License",
-        "type": "select",
-        "options": [
-          "Public Domain",
-          "PDDL: Public Domain Dedication and License",
-          "ODC-By: Attribution License",
-          "ODC-ODbL: Open Database License",
-          "CDLA-Sharing: Community Data License Agreement",
-          "CDLA-Permissive: Community Data License Agreement",
-          "CC0: Public Domain Dedication",
-          "CC BY: Attribution 4.0 International",
-          "CC BY-SA: Attribution-ShareAlike 4.0 International",
-          "CC BY-ND: Attribution-NoDerivatives 4.0 International",
-          "CC BY-NC: Attribution-NonCommercial 4.0 International",
-          "CC BY-NC-SA: Attribution-NonCommercial-ShareAlike 4.0 International",
-          "CC BY-NC-ND: Attribution-NonCommercial-NoDerivatives 4.0 International",
-          "No License Specified"
-        ],
-        "required": true
-      },
       {
         "name": "termsAndConditions",
         "label": "Terms & Conditions",
diff --git a/src/@types/MetaData.d.ts b/src/@types/MetaData.d.ts
index 16109a8de..1b4718bfd 100644
--- a/src/@types/MetaData.d.ts
+++ b/src/@types/MetaData.d.ts
@@ -30,12 +30,10 @@ export interface MetadataPublishForm {
   description: string
   files: string | File[]
   author: string
-  license: string
   dataTokenOptions: DataTokenOptions
   access: 'Download' | 'Compute' | string
   termsAndConditions: boolean
   // ---- optional fields ----
-  copyrightHolder?: string
   tags?: string
   links?: string | File[]
 }
diff --git a/src/components/organisms/AssetContent/MetaFull.tsx b/src/components/organisms/AssetContent/MetaFull.tsx
index be00a6e06..d7f9c93cd 100644
--- a/src/components/organisms/AssetContent/MetaFull.tsx
+++ b/src/components/organisms/AssetContent/MetaFull.tsx
@@ -13,19 +13,11 @@ export default function MetaFull({
   metadata: MetadataMarket
 }): ReactElement {
   const { id } = ddo
-  const { dateCreated, datePublished, license } = metadata.main
+  const { dateCreated, datePublished } = metadata.main
 
   return (
     <div className={styles.metaFull}>
       <MetaItem title="Author" content={metadata?.main.author} />
-      {metadata?.additionalInformation?.copyrightHolder && (
-        <MetaItem
-          title="Copyright Holder"
-          content={metadata?.additionalInformation?.copyrightHolder}
-        />
-      )}
-
-      <MetaItem title="License" content={license} />
 
       {metadata?.additionalInformation?.categories && (
         <MetaItem
diff --git a/src/components/pages/Publish/utils.ts b/src/components/pages/Publish/utils.ts
index 76c89849b..951bf2425 100644
--- a/src/components/pages/Publish/utils.ts
+++ b/src/components/pages/Publish/utils.ts
@@ -17,9 +17,7 @@ export function transformPublishFormToMetadata(
   const {
     name,
     author,
-    license,
     description,
-    copyrightHolder,
     tags,
     links,
     termsAndConditions,
@@ -34,12 +32,11 @@ export function transformPublishFormToMetadata(
       dateCreated: currentTime,
       datePublished: currentTime,
       files: typeof files !== 'string' && files,
-      license
+      license: 'https://market.oceanprotocol.com/terms'
     },
     additionalInformation: {
       ...AssetModel.additionalInformation,
       description,
-      copyrightHolder,
       tags: transformTags(tags),
       links: typeof links !== 'string' && links,
       termsAndConditions
diff --git a/src/models/FormPublish.ts b/src/models/FormPublish.ts
index 6f85b8faf..da4134d19 100644
--- a/src/models/FormPublish.ts
+++ b/src/models/FormPublish.ts
@@ -14,14 +14,12 @@ export const validationSchema = Yup.object().shape<MetadataPublishForm>({
     .required('Required'),
   files: Yup.array<FileMetadata>().required('Required').nullable(),
   description: Yup.string().required('Required'),
-  license: Yup.string().required('Required'),
   access: Yup.string()
     .matches(/Compute|Download/g)
     .required('Required'),
   termsAndConditions: Yup.boolean().required('Required'),
 
   // ---- optional fields ----
-  copyrightHolder: Yup.string().nullable(),
   tags: Yup.string().nullable(),
   links: Yup.object<FileMetadata[]>().nullable()
 })
@@ -35,7 +33,6 @@ export const initialValues: Partial<MetadataPublishForm> = {
   },
   files: '',
   description: '',
-  license: '',
   access: '',
   termsAndConditions: false
 }

From b600e4cd4402a58d411c6cc1365b34e40097e3b2 Mon Sep 17 00:00:00 2001
From: mihaisc <mihai.scarlat@smartcontrol.ro>
Date: Tue, 27 Oct 2020 14:01:52 +0200
Subject: [PATCH 2/3] remove copyright

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
---
 src/components/organisms/AssetContent/index.tsx | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/components/organisms/AssetContent/index.tsx b/src/components/organisms/AssetContent/index.tsx
index 3d3419c12..63178ff73 100644
--- a/src/components/organisms/AssetContent/index.tsx
+++ b/src/components/organisms/AssetContent/index.tsx
@@ -39,10 +39,7 @@ export default function AssetContent({
 
         <div className={styles.content}>
           <aside className={styles.meta}>
-            <p className={styles.author}>
-              {metadata?.additionalInformation?.copyrightHolder ||
-                metadata?.main.author}
-            </p>
+            <p className={styles.author}>{metadata?.main.author}</p>
 
             <p className={styles.datatoken}>
               <EtherscanLink

From 400ff6a4fd70cbdc9c1612be01833a4cc94b7fb0 Mon Sep 17 00:00:00 2001
From: mihaisc <mihai.scarlat@smartcontrol.ro>
Date: Tue, 27 Oct 2020 14:03:10 +0200
Subject: [PATCH 3/3] fix test

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
---
 tests/unit/__fixtures__/testFormData.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/unit/__fixtures__/testFormData.ts b/tests/unit/__fixtures__/testFormData.ts
index 1ab1b3ad0..b00feb7ac 100644
--- a/tests/unit/__fixtures__/testFormData.ts
+++ b/tests/unit/__fixtures__/testFormData.ts
@@ -3,7 +3,6 @@ import { MetadataPublishForm } from '../../../src/@types/MetaData'
 const testFormData: MetadataPublishForm = {
   author: '',
   files: [],
-  license: '',
   dataTokenOptions: {
     name: '',
     symbol: ''