Merge pull request #935 from jessopb/licenseDev2

Adds License and LicenseUrl to AssetInfo and Publish/Edit Forms

client/scss/_select.scss

@@ -1,6 +1,7 @@
 select {
   margin: 0;
   display: inline-block;
-  background: $base-color;
+  background: $background-color;
   border: 0;
+  color: $text-color;
 }

client/src/components/ChannelSelectDropdown/index.jsx

@@ -7,9 +7,6 @@ const ChannelSelectDropdown = ({ selectedChannel, handleSelection, loggedInChann
       id='channel-name-select'
       value={selectedChannel}
       onChange={handleSelection}>
-      { loggedInChannelName && (
-        <option value={loggedInChannelName} >{loggedInChannelName}</option>
-      )}
       <option value={LOGIN}>Existing</option>
       <option value={CREATE}>New</option>
     </select>

client/src/components/PublishLicenseInput/index.jsx

@@ -1,23 +1,28 @@
 import React from 'react';
 import RowLabeled from '@components/RowLabeled';
 import Label from '@components/Label';
+import { LICENSES } from '@clientConstants/publish_license_urls';
 
-const PublishLicenseInput = ({ handleSelect }) => {
+const PublishLicenseInput = ({ handleSelect, license }) => {
   return (
     <RowLabeled
       label={
-        <Label value={'License:'} />
+        <Label value={'License'} />
       }
       content={
         <select
           type='text'
           name='license'
           id='publish-license'
+          value={license}
           onChange={handleSelect}
         >
           <option value=''>Unspecified</option>
-          <option value='Public Domain'>Public Domain</option>
-          <option value='Creative Commons'>Creative Commons</option>
+          {
+            LICENSES.map(function(item, i){
+              return <option key={item + 'license key'} value={item}>{item}</option>;
+            })
+          }
         </select>
       }
     />

client/src/components/PublishLicenseUrlInput/index.jsx

@@ -0,0 +1,32 @@
+import React from 'react';
+import RowLabeled from '@components/RowLabeled';
+import Label from '@components/Label';
+import { CC_LICENSES } from '@clientConstants/publish_license_urls';
+
+const PublishLicenseUrlInput = ({ handleSelect, licenseUrl }) => {
+  return (
+    <RowLabeled
+      label={
+        <Label value={'License Url'} />
+      }
+      content={
+        <select
+          type='text'
+          name='licenseUrl'
+          id='publish-license-url'
+          value={licenseUrl}
+          onChange={handleSelect}
+        >
+          <option value=''>Unspecified</option>
+          {
+            CC_LICENSES.map(function(item, i){
+              return <option key={item.url} value={item.url}>{item.value}</option>
+            })
+          }
+        </select>
+      }
+    />
+  );
+};
+
+export default PublishLicenseUrlInput;

client/src/constants/publish_license_urls.js

@@ -0,0 +1,33 @@
+export const CC_LICENSES = [
+  {
+    value: 'CC Attr. 4.0 Int',
+    url: 'https://creativecommons.org/licenses/by/4.0/legalcode',
+  },
+  {
+    value: 'CC Attr-ShareAlike 4.0 Int',
+    url: 'https://creativecommons.org/licenses/by-sa/4.0/legalcode',
+  },
+  {
+    value: 'CC Attr-NoDerivatives 4.0 Int',
+    url: 'https://creativecommons.org/licenses/by-nd/4.0/legalcode',
+  },
+  {
+    value: 'CC Attr-NonComm 4.0 Int',
+    url: 'https://creativecommons.org/licenses/by-nc/4.0/legalcode',
+  },
+  {
+    value: 'CC Attr-NonComm-ShareAlike 4.0 Int',
+    url: 'https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode',
+  },
+  {
+    value: 'CC Attr-NonComm-NoDerivatives 4.0 Int',
+    url: 'https://creativecommons.org/licenses/by-nc-nd/4.0/legalcode',
+  },
+];
+
+export const LICENSES = ['Public Domain', 'Other', 'Copyright', 'Creative Commons'];
+
+export const PUBLIC_DOMAIN = 'Public Domain';
+export const OTHER = 'other';
+export const COPYRIGHT = 'copyright';
+export const CREATIVE_COMMONS = 'Creative Commons';

client/src/containers/AssetInfo/view.jsx

@@ -7,7 +7,7 @@ import AssetShareButtons from '@components/AssetShareButtons';
 import ClickToCopy from '@components/ClickToCopy';
 import siteConfig from '@config/siteConfig.json';
 import createCanonicalLink from '@globalutils/createCanonicalLink';
-import AssetInfoFooter from '../../components/AssetInfoFooter/index';
+import AssetInfoFooter from '@components/AssetInfoFooter/index';
 import { createPermanentURI } from '@clientutils/createPermanentURI';
 import ReactMarkdown from 'react-markdown';
 
@@ -18,7 +18,20 @@ class AssetInfo extends React.Component {
   render () {
     const { editable, asset } = this.props;
     const { claimViews, claimData } = asset;
-    const { channelName, claimId, channelShortId, description, name, fileExt, contentType, host, certificateId } = claimData;
+    const {
+      channelName,
+      claimId,
+      channelShortId,
+      description,
+      name,
+      fileExt,
+      contentType,
+      host,
+      certificateId,
+      license,
+      licenseUrl,
+      transactionTime
+    } = claimData;
 
     const canonicalUrl = createCanonicalLink({ asset: { ...claimData, shortId: asset.shortId }});
     const assetCanonicalUrl = `${host}${canonicalUrl}`;
@@ -55,7 +68,7 @@ class AssetInfo extends React.Component {
         {editable && (
           <RowLabeled
             label={<Label value={'Edit'} />}
-            content={<Link to={`/edit${canonicalUrl}`}>{name}</Link>}
+            content={<Link className='link--primary' to={`/edit${canonicalUrl}`}>{name}</Link>}
           />
         )}
         {channelName && (
@@ -71,6 +84,7 @@ class AssetInfo extends React.Component {
             }
           />
         )}
+        <SpaceBetween>
           {claimViews ? (
             <RowLabeled
               label={
@@ -83,7 +97,22 @@ class AssetInfo extends React.Component {
               }
             />
           ) : null}
-
+          {license && (
+            <RowLabeled
+              label={
+                <Label value={'License'} />
+              }
+              content={
+                <div className='text'>
+                  {licenseUrl ? (
+                    <a className={'link--primary'} href={licenseUrl} target={'_blank'}>{license}</a>
+                  ) : (
+                    <span>{license}</span> )}
+                </div>
+              }
+            />
+          )}
+        </SpaceBetween>
         <RowLabeled
           label={
             <Label value={'Share'} />

client/src/containers/PublishMetadataInputs/index.js

@@ -7,6 +7,7 @@ const mapStateToProps = ({ publish }) => {
     showMetadataInputs: publish.showMetadataInputs,
     description: publish.metadata.description,
     license: publish.metadata.license,
+    licenseUrl: publish.metadata.licenseUrl,
     nsfw: publish.metadata.nsfw,
     isUpdate: publish.isUpdate,
   };
@@ -17,10 +18,13 @@ const mapDispatchToProps = dispatch => {
     onMetadataChange: (name, value) => {
       dispatch(updateMetadata(name, value));
     },
-    onToggleMetadataInputs: (value) => {
+    onToggleMetadataInputs: value => {
       dispatch(toggleMetadataInputs(value));
     },
   };
 };
 
-export default connect(mapStateToProps, mapDispatchToProps)(View);
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(View);

client/src/containers/PublishMetadataInputs/view.jsx

@@ -1,9 +1,9 @@
 import React from 'react';
 import PublishDescriptionInput from '@components/PublishDescriptionInput';
 import PublishLicenseInput from '@components/PublishLicenseInput';
+import PublishLicenseUrlInput from '@components/PublishLicenseUrlInput';
 import PublishNsfwInput from '@components/PublishNsfwInput';
 import ButtonSecondary from '@components/ButtonSecondary';
-import Row from '@components/Row';
 
 class PublishMetadataInputs extends React.Component {
   constructor (props) {
@@ -25,22 +25,32 @@ class PublishMetadataInputs extends React.Component {
     const name = event.target.name;
     const selectedOption = event.target.selectedOptions[0].value;
     this.props.onMetadataChange(name, selectedOption);
+    if (name === 'license' && selectedOption !== 'Creative Commons'){
+      this.props.onMetadataChange('licenseUrl', '');
+    }
   }
   render () {
-    const { showMetadataInputs, description, isUpdate, nsfw } = this.props;
+    const { showMetadataInputs, description, isUpdate, nsfw, license, licenseUrl } = this.props;
     return (
       <div>
         {(showMetadataInputs || isUpdate) && (
           <React.Fragment>
             <PublishDescriptionInput
-              description={this.props.description}
+              description={description}
               handleInput={this.handleInput}
             />
             <PublishLicenseInput
               handleSelect={this.handleSelect}
+              license={license}
             />
+            { (this.props.license === 'Creative Commons') && (
+              <PublishLicenseUrlInput
+                handleSelect={this.handleSelect}
+                licenseUrl={licenseUrl}
+              />
+            )}
             <PublishNsfwInput
-              nsfw={this.props.nsfw}
+              nsfw={nsfw}
               handleInput={this.handleInput}
             />
           </React.Fragment>

client/src/pages/EditPage/view.jsx

@@ -9,7 +9,7 @@ class EditPage extends React.Component {
     onHandleShowPageUri(match.params);
     setUpdateTrue();
     if (asset) {
-      ['title', 'description', 'license', 'nsfw'].forEach(meta => updateMetadata(meta, asset.claimData[meta]));
+      ['title', 'description', 'license', 'licenseUrl', 'nsfw'].forEach(meta => updateMetadata(meta, asset.claimData[meta]));
     }
     setHasChanged(false);
   }

client/src/reducers/publish.js

@@ -39,6 +39,7 @@ const initialState = {
     title: '',
     description: '',
     license: '',
+    licenseUrl: '',
     nsfw: false,
   },
   isUpdate: false,
@@ -51,7 +52,8 @@ const initialState = {
 export default function(state = initialState, action) {
   switch (action.type) {
     case actions.FILE_SELECTED:
-      return Object.assign({}, state.isUpdate ? state : initialState, {  // note: clears to initial state
+      return Object.assign({}, state.isUpdate ? state : initialState, {
+        // note: clears to initial state
         file: action.data,
         hasChanged: true,
       });
@@ -112,4 +114,4 @@ export default function (state = initialState, action) {
     default:
       return state;
   }
-};
+}

client/src/utils/publish.js

@@ -1,9 +1,16 @@
-export const createPublishMetadata = (claim, { type }, { title, description, license, nsfw }, publishInChannel, selectedChannel) => {
+export const createPublishMetadata = (
+  claim,
+  { type },
+  { title, description, license, licenseUrl, nsfw },
+  publishInChannel,
+  selectedChannel
+) => {
   let metadata = {
     name: claim,
     title,
     description,
     license,
+    licenseUrl,
     nsfw,
     type,
   };

server/chainquery/models/ClaimModel.js

@@ -6,7 +6,7 @@ const {
 
 const getterMethods = {
   generated_extension() {
-    logger.info('trying to generate extension', this.content_type);
+    logger.debug('trying to generate extension', this.content_type);
     if (customFileExtensions.hasOwnProperty(this.content_type)) {
       return customFileExtensions[this.content_type];
     } else {
@@ -136,6 +136,14 @@ export default (sequelize, { BOOLEAN, DATE, DECIMAL, ENUM, INTEGER, STRING, TEXT
         type: STRING,
         set() {},
       },
+      license: {
+        type: STRING,
+        set() {},
+      },
+      license_url: {
+        type: STRING,
+        set() {},
+      },
     },
     {
       freezeTableName: true,

server/controllers/api/channel/claims/getChannelClaims.js

@@ -1,8 +1,10 @@
 const chainquery = require('chainquery').default;
+const logger = require('winston');
 const getClaimData = require('server/utils/getClaimData');
 const { returnPaginatedChannelClaims } = require('./channelPagination.js');
 
 const getChannelClaims = async (channelName, channelLongId, page) => {
+  logger.debug(`getChannelClaims: ${channelName}, ${channelLongId}, ${page}`);
   let channelShortId = await chainquery.claim.queries.getShortClaimIdFromLongClaimId(
     channelLongId,
     channelName

server/controllers/api/claim/publish/createPublishParams.js

@@ -1,6 +1,17 @@
 const logger = require('winston');
 const { details, publishing } = require('@config/siteConfig');
-const createPublishParams = (filePath, name, title, description, license, nsfw, thumbnail, channelName, channelClaimId) => {
+const createPublishParams = (
+  filePath,
+  name,
+  title,
+  description,
+  license,
+  licenseUrl,
+  nsfw,
+  thumbnail,
+  channelName,
+  channelClaimId
+) => {
   // provide defaults for title
   if (title === null || title.trim() === '') {
     title = name;
@@ -13,6 +24,10 @@ const createPublishParams = (filePath, name, title, description, license, nsfw,
   if (license === null || license.trim() === '') {
     license = ''; // default to empty string
   }
+  // provide default for licenseUrl
+  if (licenseUrl === null || licenseUrl.trim() === '') {
+    licenseUrl = ''; // default to empty string
+  }
   // create the basic publish params
   const publishParams = {
     name,
@@ -24,6 +39,7 @@ const createPublishParams = (filePath, name, title, description, license, nsfw,
       author: details.title,
       language: 'en',
       license,
+      licenseUrl,
       nsfw,
     },
     claim_address: publishing.primaryClaimAddress,

server/controllers/api/claim/publish/createThumbnailPublishParams.js

@@ -1,7 +1,7 @@
 const logger = require('winston');
 const { details, publishing } = require('@config/siteConfig');
 
-const createThumbnailPublishParams = (thumbnailFilePath, claimName, license, nsfw) => {
+const createThumbnailPublishParams = (thumbnailFilePath, claimName, license, licenseUrl, nsfw) => {
   if (!thumbnailFilePath) {
     return;
   }
@@ -17,6 +17,7 @@ const createThumbnailPublishParams = (thumbnailFilePath, claimName, license, nsf
       author: details.title,
       language: 'en',
       license,
+      licenseUrl,
       nsfw,
     },
     claim_address: publishing.primaryClaimAddress,

server/controllers/api/claim/publish/index.js

@@ -1,10 +1,15 @@
 const logger = require('winston');
 
-const { details: { host }, publishing: { disabled, disabledMessage } } = require('@config/siteConfig');
+const {
+  details: { host },
+  publishing: { disabled, disabledMessage },
+} = require('@config/siteConfig');
 
-const { sendGATimingEvent } = require('../../../../utils/googleAnalytics.js');
+const { sendGATimingEvent } = require('server/utils/googleAnalytics.js');
 const isApprovedChannel = require('@globalutils/isApprovedChannel');
-const { publishing: { publishOnlyApproved, approvedChannels } } = require('@config/siteConfig');
+const {
+  publishing: { publishOnlyApproved, approvedChannels },
+} = require('@config/siteConfig');
 
 const { handleErrorResponse } = require('../../../utils/errorHandlers.js');
 
@@ -55,6 +60,7 @@ const claimPublish = ({ body, files, headers, ip, originalUrl, user, tor }, res)
     fileType,
     gaStartTime,
     license,
+    licenseUrl,
     name,
     nsfw,
     thumbnail,
@@ -69,8 +75,24 @@ const claimPublish = ({ body, files, headers, ip, originalUrl, user, tor }, res)
   // validate the body and files of the request
   try {
     // validateApiPublishRequest(body, files);
-    ({name, nsfw, license, title, description, thumbnail} = parsePublishApiRequestBody(body));
-    ({fileName, filePath, fileExtension, fileType, thumbnailFileName, thumbnailFilePath, thumbnailFileType} = parsePublishApiRequestFiles(files));
+    ({
+      name,
+      nsfw,
+      license,
+      licenseUrl,
+      title,
+      description,
+      thumbnail,
+    } = parsePublishApiRequestBody(body));
+    ({
+      fileName,
+      filePath,
+      fileExtension,
+      fileType,
+      thumbnailFileName,
+      thumbnailFilePath,
+      thumbnailFileType,
+    } = parsePublishApiRequestFiles(files));
     ({ channelName, channelId, channelPassword } = body);
   } catch (error) {
     return res.status(400).json({ success: false, message: error.message });
@@ -88,8 +110,19 @@ const claimPublish = ({ body, files, headers, ip, originalUrl, user, tor }, res)
 
       return Promise.all([
         checkClaimAvailability(name),
-        createPublishParams(filePath, name, title, description, license, nsfw, thumbnail, channelName, channelClaimId),
-        createThumbnailPublishParams(thumbnailFilePath, name, license, nsfw),
+        createPublishParams(
+          filePath,
+          name,
+          title,
+          description,
+          license,
+          licenseUrl,
+          nsfw,
+          thumbnail,
+          channelName,
+          channelClaimId
+        ),
+        createThumbnailPublishParams(thumbnailFilePath, name, license, licenseUrl, nsfw),
       ]);
     })
     .then(([claimAvailable, publishParams, thumbnailPublishParams]) => {
@@ -113,9 +146,15 @@ const claimPublish = ({ body, files, headers, ip, originalUrl, user, tor }, res)
       ({ claimId } = claimData);
 
       if (channelName) {
-        return chainquery.claim.queries.getShortClaimIdFromLongClaimId(claimData.certificateId, channelName);
+        logger.info(`api/claim/publish: claimData.certificateId ${claimData.certificateId}`);
+        return chainquery.claim.queries.getShortClaimIdFromLongClaimId(
+          claimData.certificateId,
+          channelName
+        );
       } else {
-        return chainquery.claim.queries.getShortClaimIdFromLongClaimId(claimId, name, claimData).catch(() => {
+        return chainquery.claim.queries
+          .getShortClaimIdFromLongClaimId(claimId, name, claimData)
+          .catch(() => {
             return claimId.slice(0, 1);
           });
       }

server/controllers/api/claim/publish/parsePublishApiRequestBody.js

@@ -1,15 +1,26 @@
-const parsePublishApiRequestBody = ({name, nsfw, license, title, description, thumbnail}) => {
+const parsePublishApiRequestBody = ({
+  name,
+  nsfw,
+  license,
+  licenseUrl,
+  title,
+  description,
+  thumbnail,
+}) => {
   // validate name
   if (!name) {
     throw new Error('no name field found in request');
   }
   const invalidNameCharacters = /[^A-Za-z0-9,-]/.exec(name);
   if (invalidNameCharacters) {
-    throw new Error('The claim name you provided is not allowed.  Only the following characters are allowed: A-Z, a-z, 0-9, and "-"');
+    throw new Error(
+      'The claim name you provided is not allowed.  Only the following characters are allowed: A-Z, a-z, 0-9, and "-"'
+    );
   }
   // optional parameters
-  nsfw = (nsfw === 'true');
+  nsfw = nsfw === 'true';
   license = license || null;
+  licenseUrl = licenseUrl || null;
   title = title || null;
   description = description || null;
   thumbnail = thumbnail || null;
@@ -18,6 +29,7 @@ const parsePublishApiRequestBody = ({name, nsfw, license, title, description, th
     name,
     nsfw,
     license,
+    licenseUrl,
     title,
     description,
     thumbnail,

server/controllers/api/claim/update/index.js

@@ -19,10 +19,11 @@ const createCanonicalLink = require('@globalutils/createCanonicalLink');
   route to update a claim through the daemon
 */
 
-const updateMetadata = ({ nsfw, license, title, description }) => {
+const updateMetadata = ({ nsfw, license, licenseUrl, title, description }) => {
   const update = {};
   if (nsfw) update['nsfw'] = nsfw;
   if (license) update['license'] = license;
+  if (licenseUrl) update['license_url'] = licenseUrl;
   if (title) update['title'] = title;
   if (description) update['description'] = description;
   return update;
@@ -65,6 +66,7 @@ const claimUpdate = ({ body, files, headers, ip, originalUrl, user, tor }, res)
     thumbnail,
     fileExtension,
     license,
+    licenseUrl,
     name,
     nsfw,
     thumbnailFileName,
@@ -127,10 +129,11 @@ const claimUpdate = ({ body, files, headers, ip, originalUrl, user, tor }, res)
           description: claimRecord.description,
           nsfw: claimRecord.nsfw,
           license: claimRecord.license,
+          licenseUrl: claimRecord.license_url,
           language: 'en',
           author: details.title,
         },
-        updateMetadata({ title, description, nsfw, license })
+        updateMetadata({ title, description, nsfw, license, licenseUrl })
       );
       const publishParams = {
         name,

server/controllers/assets/utils/serveFile.js

@@ -1,10 +1,12 @@
 const logger = require('winston');
 const transformImage = require('./transformImage');
-const isValidQueryObject = require('../../../utils/isValidQueryObj');
+
+const isValidQueryObject = require('server/utils/isValidQueryObj');
 const {
   serving: { dynamicFileSizing },
 } = require('@config/siteConfig');
 const { enabled: dynamicEnabled } = dynamicFileSizing;
+
 const serveFile = async ({ filePath, fileType }, res, originalUrl) => {
   const queryObject = {};
   // TODO: replace quick/dirty try catch with better practice

server/utils/getClaimData.js

@@ -59,5 +59,8 @@ module.exports = async (data, chName = null, chShortId = null) => {
     host,
     pending: Boolean(dataVals.height === 0),
     blocked: blocked,
+    license: dataVals.license,
+    licenseUrl: dataVals.license_url,
+    transactionTime: dataVals.transaction_time,
   };
 };

utils/createModuleAliases.js

@@ -39,6 +39,9 @@ module.exports = () => {
   moduleAliases['@clientutils'] = resolve(`${DEFAULT_ROOT}/utils`);
   // moduleAliases['@serverutils'] = resolve('server/utils');
 
+  // aliases for constants
+  moduleAliases['@clientConstants'] = resolve(`${DEFAULT_ROOT}/constants`);
+
   // create specific aliases for locally defined components in the following folders
   moduleAliases = addAliasesForCustomComponentFolder('containers', moduleAliases);
   moduleAliases = addAliasesForCustomComponentFolder('components', moduleAliases);
@@ -53,7 +56,6 @@ module.exports = () => {
   moduleAliases['@sagas'] = resolve(`${DEFAULT_ROOT}/sagas`);
   moduleAliases['@app'] = resolve(`${DEFAULT_ROOT}/app.js`);
 
-
   // return finished aliases
   return moduleAliases;
 };