From 7d5e41153e5532f644bb189d4c58adc830002554 Mon Sep 17 00:00:00 2001
From: jessop <jessopb@gmail.com>
Date: Sat, 23 Feb 2019 00:52:31 -0500
Subject: [PATCH 1/2] adds licenseUrl

---
 .../components/PublishLicenseInput/index.jsx  | 10 ++-
 .../PublishLicenseUrlInput/index.jsx          | 31 ++++++++
 client/src/constants/publish_license_urls.js  | 33 ++++++++
 client/src/containers/AssetInfo/view.jsx      | 43 +++++++---
 client/src/containers/ChannelSelect/view.jsx  |  9 ++-
 .../containers/PublishMetadataInputs/index.js | 20 +++--
 .../containers/PublishMetadataInputs/view.jsx | 12 ++-
 client/src/pages/EditPage/view.jsx            |  2 +-
 client/src/reducers/publish.js                | 46 +++++------
 client/src/utils/publish.js                   |  9 ++-
 server/chainquery/models/ClaimModel.js        |  8 ++
 server/chainquery/queries/claimQueries.js     |  2 +-
 .../api/channel/claims/getChannelClaims.js    |  2 +
 .../api/claim/publish/createPublishParams.js  | 26 ++++--
 .../publish/createThumbnailPublishParams.js   | 19 ++---
 server/controllers/api/claim/publish/index.js | 79 ++++++++++++++-----
 .../publish/parsePublishApiRequestBody.js     | 18 ++++-
 server/controllers/api/claim/update/index.js  |  9 ++-
 server/utils/getClaimData.js                  |  3 +
 19 files changed, 288 insertions(+), 93 deletions(-)
 create mode 100644 client/src/components/PublishLicenseUrlInput/index.jsx
 create mode 100644 client/src/constants/publish_license_urls.js

diff --git a/client/src/components/PublishLicenseInput/index.jsx b/client/src/components/PublishLicenseInput/index.jsx
index af827ec8..213e0be9 100644
--- a/client/src/components/PublishLicenseInput/index.jsx
+++ b/client/src/components/PublishLicenseInput/index.jsx
@@ -1,12 +1,13 @@
 import React from 'react';
 import RowLabeled from '@components/RowLabeled';
 import Label from '@components/Label';
+import { LICENSES } from '../../constants/publish_license_urls';
 
 const PublishLicenseInput = ({ handleSelect }) => {
   return (
     <RowLabeled
       label={
-        <Label value={'License:'} />
+        <Label value={'License'} />
       }
       content={
         <select
@@ -16,8 +17,11 @@ const PublishLicenseInput = ({ handleSelect }) => {
           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>
       }
     />
diff --git a/client/src/components/PublishLicenseUrlInput/index.jsx b/client/src/components/PublishLicenseUrlInput/index.jsx
new file mode 100644
index 00000000..cfbce431
--- /dev/null
+++ b/client/src/components/PublishLicenseUrlInput/index.jsx
@@ -0,0 +1,31 @@
+import React from 'react';
+import RowLabeled from '@components/RowLabeled';
+import Label from '@components/Label';
+import { CC_LICENSES } from '../../constants/publish_license_urls';
+
+const PublishLicenseUrlInput = ({ handleSelect }) => {
+  return (
+    <RowLabeled
+      label={
+        <Label value={'License Url'} />
+      }
+      content={
+        <select
+          type='text'
+          name='licenseUrl'
+          id='publish-license-url'
+          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;
diff --git a/client/src/constants/publish_license_urls.js b/client/src/constants/publish_license_urls.js
new file mode 100644
index 00000000..06f1db9f
--- /dev/null
+++ b/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';
diff --git a/client/src/containers/AssetInfo/view.jsx b/client/src/containers/AssetInfo/view.jsx
index 49dfeedc..280a7baa 100644
--- a/client/src/containers/AssetInfo/view.jsx
+++ b/client/src/containers/AssetInfo/view.jsx
@@ -18,7 +18,7 @@ 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}`;
@@ -71,19 +71,36 @@ class AssetInfo extends React.Component {
             }
           />
         )}
-        {claimViews ? (
-          <RowLabeled
-            label={
-              <Label value={'Views'} />
-            }
-            content={
-              <span className='text'>
-                {claimViews}
-              </span>
-            }
-          />
-        ) : null}
+        <SpaceBetween>
+          {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>
+              }
+            />
+          )}
 
+          {claimViews ? (
+            <RowLabeled
+              label={
+                <Label value={'Views'} />
+              }
+              content={
+                <span className='text'>
+                  {claimViews}
+                </span>
+              }
+            />
+          ) : null}
+        </SpaceBetween>
         <RowLabeled
           label={
             <Label value={'Share'} />
diff --git a/client/src/containers/ChannelSelect/view.jsx b/client/src/containers/ChannelSelect/view.jsx
index b8276a3d..ae5f379f 100644
--- a/client/src/containers/ChannelSelect/view.jsx
+++ b/client/src/containers/ChannelSelect/view.jsx
@@ -18,10 +18,10 @@ class ChannelSelect extends React.Component {
   componentWillMount () {
     const { loggedInChannelName, onChannelSelect, publishOnlyApproved, onPublishInChannelChange } = this.props;
     if (loggedInChannelName) {
-      onChannelSelect(loggedInChannelName);
+      this.props.onPublishInChannelChange(true);
     }
     if (publishOnlyApproved) {
-      onPublishInChannelChange(true);
+      this.props.onPublishInChannelChange(true);
     }
   }
   toggleAnonymousPublish (event) {
@@ -37,7 +37,10 @@ class ChannelSelect extends React.Component {
     this.props.onChannelSelect(selectedOption);
   }
   render () {
-    const { publishInChannel, channelError, selectedChannel, loggedInChannelName, publishOnlyApproved } = this.props;
+    let { publishInChannel, channelError, selectedChannel, loggedInChannelName, publishOnlyApproved } = this.props;
+    if (loggedInChannelName) {
+      publishInChannel = 'checked';
+    }
     if (publishOnlyApproved) {
       return (
         <React.Fragment>
diff --git a/client/src/containers/PublishMetadataInputs/index.js b/client/src/containers/PublishMetadataInputs/index.js
index 1c5b462a..7e31ce30 100644
--- a/client/src/containers/PublishMetadataInputs/index.js
+++ b/client/src/containers/PublishMetadataInputs/index.js
@@ -1,14 +1,15 @@
-import {connect} from 'react-redux';
-import {updateMetadata, toggleMetadataInputs} from '../../actions/publish';
+import { connect } from 'react-redux';
+import { updateMetadata, toggleMetadataInputs } from '../../actions/publish';
 import View from './view';
 
 const mapStateToProps = ({ publish }) => {
   return {
     showMetadataInputs: publish.showMetadataInputs,
-    description       : publish.metadata.description,
-    license           : publish.metadata.license,
-    nsfw              : publish.metadata.nsfw,
-    isUpdate          : publish.isUpdate,
+    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);
diff --git a/client/src/containers/PublishMetadataInputs/view.jsx b/client/src/containers/PublishMetadataInputs/view.jsx
index 2234e2ad..bee1228c 100644
--- a/client/src/containers/PublishMetadataInputs/view.jsx
+++ b/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,12 +25,15 @@ 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;
     return (
       <div>
-  {(showMetadataInputs || isUpdate) && (
+        {(showMetadataInputs || isUpdate) && (
           <React.Fragment>
             <PublishDescriptionInput
               description={this.props.description}
@@ -39,6 +42,11 @@ class PublishMetadataInputs extends React.Component {
             <PublishLicenseInput
               handleSelect={this.handleSelect}
             />
+            { (this.props.license === 'Creative Commons') && (
+              <PublishLicenseUrlInput
+                handleSelect={this.handleSelect}
+              />
+            )}
             <PublishNsfwInput
               nsfw={this.props.nsfw}
               handleInput={this.handleInput}
diff --git a/client/src/pages/EditPage/view.jsx b/client/src/pages/EditPage/view.jsx
index 60b07900..eab64176 100644
--- a/client/src/pages/EditPage/view.jsx
+++ b/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);
   }
diff --git a/client/src/reducers/publish.js b/client/src/reducers/publish.js
index 25171405..58a37aa4 100644
--- a/client/src/reducers/publish.js
+++ b/client/src/reducers/publish.js
@@ -19,40 +19,42 @@ if (siteConfig) {
 
 // create initial state
 const initialState = {
-  disabled          : disabledConfig,
-  disabledMessage   : disabledMessageConfig,
-  publishInChannel  : false,
-  selectedChannel   : LOGIN,
+  disabled: disabledConfig,
+  disabledMessage: disabledMessageConfig,
+  publishInChannel: false,
+  selectedChannel: LOGIN,
   showMetadataInputs: false,
-  status            : {
-    status : null,
+  status: {
+    status: null,
     message: null,
   },
   error: {
-    file   : null,
-    url    : null,
+    file: null,
+    url: null,
     channel: null,
   },
-  file    : null,
-  claim   : '',
+  file: null,
+  claim: '',
   metadata: {
-    title      : '',
+    title: '',
     description: '',
-    license    : '',
-    nsfw       : false,
+    license: '',
+    licenseUrl: '',
+    nsfw: false,
   },
-  isUpdate  : false,
+  isUpdate: false,
   hasChanged: false,
-  thumbnail : null,
+  thumbnail: null,
   thumbnailChannel,
   thumbnailChannelId,
 };
 
-export default function (state = initialState, action) {
+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
-        file      : action.data,
+      return Object.assign({}, state.isUpdate ? state : initialState, {
+        // note: clears to initial state
+        file: action.data,
         hasChanged: true,
       });
     case actions.FILE_CLEAR:
@@ -66,13 +68,13 @@ export default function (state = initialState, action) {
       });
     case actions.CLAIM_UPDATE:
       return Object.assign({}, state, {
-        claim     : action.data,
+        claim: action.data,
         hasChanged: true,
       });
     case actions.SET_PUBLISH_IN_CHANNEL:
       return Object.assign({}, state, {
         publishInChannel: action.channel,
-        hasChanged      : true,
+        hasChanged: true,
       });
     case actions.PUBLISH_STATUS_UPDATE:
       return Object.assign({}, state, {
@@ -96,7 +98,7 @@ export default function (state = initialState, action) {
     case actions.THUMBNAIL_NEW:
       return {
         ...state,
-        thumbnail : action.data,
+        thumbnail: action.data,
         hasChanged: true,
       };
     case actions.SET_UPDATE_TRUE:
@@ -112,4 +114,4 @@ export default function (state = initialState, action) {
     default:
       return state;
   }
-};
+}
diff --git a/client/src/utils/publish.js b/client/src/utils/publish.js
index 00ac2240..4de574cf 100644
--- a/client/src/utils/publish.js
+++ b/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,
   };
diff --git a/server/chainquery/models/ClaimModel.js b/server/chainquery/models/ClaimModel.js
index 4fcc1af0..e90713ae 100644
--- a/server/chainquery/models/ClaimModel.js
+++ b/server/chainquery/models/ClaimModel.js
@@ -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,
diff --git a/server/chainquery/queries/claimQueries.js b/server/chainquery/queries/claimQueries.js
index 6270ea5d..fecce12b 100644
--- a/server/chainquery/queries/claimQueries.js
+++ b/server/chainquery/queries/claimQueries.js
@@ -51,7 +51,7 @@ export default (db, table, sequelize) => ({
   },
 
   getShortClaimIdFromLongClaimId: async (claimId, claimName, pendingClaim) => {
-    logger.debug(`claim.getShortClaimIdFromLongClaimId for ${claimName}#${claimId}`);
+    logger.info(`claim.getShortClaimIdFromLongClaimId for ${claimName}#${claimId}`);
     return await table
       .findAll({
         where: { name: claimName },
diff --git a/server/controllers/api/channel/claims/getChannelClaims.js b/server/controllers/api/channel/claims/getChannelClaims.js
index 921c1f2e..ab1c3f36 100644
--- a/server/controllers/api/channel/claims/getChannelClaims.js
+++ b/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.info(`getChannelClaims: ${channelName}, ${channelLongId}, ${page}`);
   let channelShortId = await chainquery.claim.queries.getShortClaimIdFromLongClaimId(
     channelLongId,
     channelName
diff --git a/server/controllers/api/claim/publish/createPublishParams.js b/server/controllers/api/claim/publish/createPublishParams.js
index 364e831a..0a51cba8 100644
--- a/server/controllers/api/claim/publish/createPublishParams.js
+++ b/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;
@@ -11,19 +22,24 @@ const createPublishParams = (filePath, name, title, description, license, nsfw,
   }
   // provide default for license
   if (license === null || license.trim() === '') {
-    license = '';  // default to empty string
+    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,
     file_path: filePath,
-    bid      : publishing.fileClaimBidAmount,
-    metadata : {
+    bid: publishing.fileClaimBidAmount,
+    metadata: {
       description,
       title,
-      author  : details.title,
+      author: details.title,
       language: 'en',
       license,
+      licenseUrl,
       nsfw,
     },
     claim_address: publishing.primaryClaimAddress,
diff --git a/server/controllers/api/claim/publish/createThumbnailPublishParams.js b/server/controllers/api/claim/publish/createThumbnailPublishParams.js
index 576ddc73..a848aab5 100644
--- a/server/controllers/api/claim/publish/createThumbnailPublishParams.js
+++ b/server/controllers/api/claim/publish/createThumbnailPublishParams.js
@@ -1,27 +1,28 @@
 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;
   }
   logger.debug(`Creating Thumbnail Publish Parameters`);
   // create the publish params
   return {
-    name     : `${claimName}-thumb`,
+    name: `${claimName}-thumb`,
     file_path: thumbnailFilePath,
-    bid      : publishing.fileClaimBidAmount,
-    metadata : {
-      title      : `${claimName} thumbnail`,
+    bid: publishing.fileClaimBidAmount,
+    metadata: {
+      title: `${claimName} thumbnail`,
       description: `a thumbnail for ${claimName}`,
-      author     : details.title,
-      language   : 'en',
+      author: details.title,
+      language: 'en',
       license,
+      licenseUrl,
       nsfw,
     },
     claim_address: publishing.primaryClaimAddress,
-    channel_name : publishing.thumbnailChannel,
-    channel_id   : publishing.thumbnailChannelId,
+    channel_name: publishing.thumbnailChannel,
+    channel_id: publishing.thumbnailChannelId,
   };
 };
 
diff --git a/server/controllers/api/claim/publish/index.js b/server/controllers/api/claim/publish/index.js
index b795bde0..a14f430d 100644
--- a/server/controllers/api/claim/publish/index.js
+++ b/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 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,18 +75,34 @@ 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));
-    ({channelName, channelId, channelPassword} = body);
+    ({
+      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});
+    return res.status(400).json({ success: false, message: error.message });
   }
   // check channel authorization
   authenticateUser(channelName, channelId, channelPassword, user)
     .then(({ channelName, channelClaimId }) => {
       if (publishOnlyApproved && !isApprovedChannel({ longId: channelClaimId }, approvedChannels)) {
         const error = {
-          name   : UNAPPROVED_CHANNEL,
+          name: UNAPPROVED_CHANNEL,
           message: 'This spee.ch instance only allows publishing to approved channels',
         };
         throw error;
@@ -88,14 +110,25 @@ 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 ]) => {
+    .then(([claimAvailable, publishParams, thumbnailPublishParams]) => {
       if (!claimAvailable) {
         const error = {
-          name   : CLAIM_TAKEN,
+          name: CLAIM_TAKEN,
           message: 'That claim name is already taken',
         };
         throw error;
@@ -110,14 +143,20 @@ const claimPublish = ({ body, files, headers, ip, originalUrl, user, tor }, res)
     .then(publishResults => {
       logger.info('Publish success >', publishResults);
       claimData = publishResults;
-      ({claimId} = claimData);
+      ({ 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 claimId.slice(0, 1);
-        });
+        return chainquery.claim.queries
+          .getShortClaimIdFromLongClaimId(claimId, name, claimData)
+          .catch(() => {
+            return claimId.slice(0, 1);
+          });
       }
     })
     .then(shortId => {
@@ -131,13 +170,13 @@ const claimPublish = ({ body, files, headers, ip, originalUrl, user, tor }, res)
       res.status(200).json({
         success: true,
         message: 'publish completed successfully',
-        data   : {
+        data: {
           name,
           claimId,
-          url     : `${host}${canonicalUrl}`, // for backwards compatability with app
-          showUrl : `${host}${canonicalUrl}`,
+          url: `${host}${canonicalUrl}`, // for backwards compatability with app
+          showUrl: `${host}${canonicalUrl}`,
           serveUrl: `${host}${canonicalUrl}${fileExtension}`,
-          pushTo  : canonicalUrl,
+          pushTo: canonicalUrl,
           claimData,
         },
       });
diff --git a/server/controllers/api/claim/publish/parsePublishApiRequestBody.js b/server/controllers/api/claim/publish/parsePublishApiRequestBody.js
index e417e0a9..f98c3369 100644
--- a/server/controllers/api/claim/publish/parsePublishApiRequestBody.js
+++ b/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,
diff --git a/server/controllers/api/claim/update/index.js b/server/controllers/api/claim/update/index.js
index 74ad8c9a..73d24750 100644
--- a/server/controllers/api/claim/update/index.js
+++ b/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,
+          license_url: claimRecord.license_url,
           language: 'en',
           author: details.title,
         },
-        updateMetadata({ title, description, nsfw, license })
+        updateMetadata({ title, description, nsfw, license, licenseUrl })
       );
       const publishParams = {
         name,
@@ -167,10 +170,12 @@ const claimUpdate = ({ body, files, headers, ip, originalUrl, user, tor }, res)
       }
 
       const fp = files && files.file && files.file.path ? files.file.path : undefined;
+      logger.info(`before updatepublish`);
       return publish(publishParams, fileName, fileType, fp);
     })
     .then(result => {
       publishResult = result;
+      logger.info(`after updatepublish then`, result);
 
       if (channelName) {
         return chainquery.claim.queries.getShortClaimIdFromLongClaimId(
diff --git a/server/utils/getClaimData.js b/server/utils/getClaimData.js
index b95d0847..2a3837f5 100644
--- a/server/utils/getClaimData.js
+++ b/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,
   };
 };
-- 
2.45.3


From 7b7a0339b8ba29754691b6138dc63a54aecf791d Mon Sep 17 00:00:00 2001
From: jessop <jessopb@gmail.com>
Date: Sun, 24 Feb 2019 01:23:56 -0500
Subject: [PATCH 2/2] licenseUrl shows on edit publish

---
 client/scss/_select.scss                      |  3 +-
 .../ChannelSelectDropdown/index.jsx           |  3 --
 .../components/PublishLicenseInput/index.jsx  |  5 +-
 .../PublishLicenseUrlInput/index.jsx          |  5 +-
 client/src/containers/AssetInfo/view.jsx      | 50 ++++++++++++-------
 client/src/containers/ChannelSelect/view.jsx  |  9 ++--
 .../containers/PublishMetadataInputs/view.jsx |  8 +--
 server/chainquery/models/ClaimModel.js        |  2 +-
 server/chainquery/queries/claimQueries.js     |  2 +-
 .../api/channel/claims/getChannelClaims.js    |  2 +-
 server/controllers/api/claim/publish/index.js |  2 +-
 server/controllers/api/claim/update/index.js  |  4 +-
 server/controllers/assets/utils/serveFile.js  |  1 +
 utils/createModuleAliases.js                  |  4 +-
 14 files changed, 56 insertions(+), 44 deletions(-)

diff --git a/client/scss/_select.scss b/client/scss/_select.scss
index 382adf4c..b095c7b3 100644
--- a/client/scss/_select.scss
+++ b/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;
 }
diff --git a/client/src/components/ChannelSelectDropdown/index.jsx b/client/src/components/ChannelSelectDropdown/index.jsx
index 2079c05c..ae4b1211 100644
--- a/client/src/components/ChannelSelectDropdown/index.jsx
+++ b/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>
diff --git a/client/src/components/PublishLicenseInput/index.jsx b/client/src/components/PublishLicenseInput/index.jsx
index 213e0be9..4ddf4f07 100644
--- a/client/src/components/PublishLicenseInput/index.jsx
+++ b/client/src/components/PublishLicenseInput/index.jsx
@@ -1,9 +1,9 @@
 import React from 'react';
 import RowLabeled from '@components/RowLabeled';
 import Label from '@components/Label';
-import { LICENSES } from '../../constants/publish_license_urls';
+import { LICENSES } from '@clientConstants/publish_license_urls';
 
-const PublishLicenseInput = ({ handleSelect }) => {
+const PublishLicenseInput = ({ handleSelect, license }) => {
   return (
     <RowLabeled
       label={
@@ -14,6 +14,7 @@ const PublishLicenseInput = ({ handleSelect }) => {
           type='text'
           name='license'
           id='publish-license'
+          value={license}
           onChange={handleSelect}
         >
           <option value=''>Unspecified</option>
diff --git a/client/src/components/PublishLicenseUrlInput/index.jsx b/client/src/components/PublishLicenseUrlInput/index.jsx
index cfbce431..8b57347e 100644
--- a/client/src/components/PublishLicenseUrlInput/index.jsx
+++ b/client/src/components/PublishLicenseUrlInput/index.jsx
@@ -1,9 +1,9 @@
 import React from 'react';
 import RowLabeled from '@components/RowLabeled';
 import Label from '@components/Label';
-import { CC_LICENSES } from '../../constants/publish_license_urls';
+import { CC_LICENSES } from '@clientConstants/publish_license_urls';
 
-const PublishLicenseUrlInput = ({ handleSelect }) => {
+const PublishLicenseUrlInput = ({ handleSelect, licenseUrl }) => {
   return (
     <RowLabeled
       label={
@@ -14,6 +14,7 @@ const PublishLicenseUrlInput = ({ handleSelect }) => {
           type='text'
           name='licenseUrl'
           id='publish-license-url'
+          value={licenseUrl}
           onChange={handleSelect}
         >
           <option value=''>Unspecified</option>
diff --git a/client/src/containers/AssetInfo/view.jsx b/client/src/containers/AssetInfo/view.jsx
index 280a7baa..79fd1436 100644
--- a/client/src/containers/AssetInfo/view.jsx
+++ b/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, license, licenseUrl, transactionTime } = 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 && (
@@ -72,22 +85,6 @@ class AssetInfo extends React.Component {
           />
         )}
         <SpaceBetween>
-          {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>
-              }
-            />
-          )}
-
           {claimViews ? (
             <RowLabeled
               label={
@@ -100,6 +97,21 @@ 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={
diff --git a/client/src/containers/ChannelSelect/view.jsx b/client/src/containers/ChannelSelect/view.jsx
index ae5f379f..b8276a3d 100644
--- a/client/src/containers/ChannelSelect/view.jsx
+++ b/client/src/containers/ChannelSelect/view.jsx
@@ -18,10 +18,10 @@ class ChannelSelect extends React.Component {
   componentWillMount () {
     const { loggedInChannelName, onChannelSelect, publishOnlyApproved, onPublishInChannelChange } = this.props;
     if (loggedInChannelName) {
-      this.props.onPublishInChannelChange(true);
+      onChannelSelect(loggedInChannelName);
     }
     if (publishOnlyApproved) {
-      this.props.onPublishInChannelChange(true);
+      onPublishInChannelChange(true);
     }
   }
   toggleAnonymousPublish (event) {
@@ -37,10 +37,7 @@ class ChannelSelect extends React.Component {
     this.props.onChannelSelect(selectedOption);
   }
   render () {
-    let { publishInChannel, channelError, selectedChannel, loggedInChannelName, publishOnlyApproved } = this.props;
-    if (loggedInChannelName) {
-      publishInChannel = 'checked';
-    }
+    const { publishInChannel, channelError, selectedChannel, loggedInChannelName, publishOnlyApproved } = this.props;
     if (publishOnlyApproved) {
       return (
         <React.Fragment>
diff --git a/client/src/containers/PublishMetadataInputs/view.jsx b/client/src/containers/PublishMetadataInputs/view.jsx
index bee1228c..07e4d8d1 100644
--- a/client/src/containers/PublishMetadataInputs/view.jsx
+++ b/client/src/containers/PublishMetadataInputs/view.jsx
@@ -30,25 +30,27 @@ class PublishMetadataInputs extends React.Component {
     }
   }
   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>
diff --git a/server/chainquery/models/ClaimModel.js b/server/chainquery/models/ClaimModel.js
index e90713ae..4157ab67 100644
--- a/server/chainquery/models/ClaimModel.js
+++ b/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 {
diff --git a/server/chainquery/queries/claimQueries.js b/server/chainquery/queries/claimQueries.js
index fecce12b..6270ea5d 100644
--- a/server/chainquery/queries/claimQueries.js
+++ b/server/chainquery/queries/claimQueries.js
@@ -51,7 +51,7 @@ export default (db, table, sequelize) => ({
   },
 
   getShortClaimIdFromLongClaimId: async (claimId, claimName, pendingClaim) => {
-    logger.info(`claim.getShortClaimIdFromLongClaimId for ${claimName}#${claimId}`);
+    logger.debug(`claim.getShortClaimIdFromLongClaimId for ${claimName}#${claimId}`);
     return await table
       .findAll({
         where: { name: claimName },
diff --git a/server/controllers/api/channel/claims/getChannelClaims.js b/server/controllers/api/channel/claims/getChannelClaims.js
index ab1c3f36..8b7eee60 100644
--- a/server/controllers/api/channel/claims/getChannelClaims.js
+++ b/server/controllers/api/channel/claims/getChannelClaims.js
@@ -4,7 +4,7 @@ const getClaimData = require('server/utils/getClaimData');
 const { returnPaginatedChannelClaims } = require('./channelPagination.js');
 
 const getChannelClaims = async (channelName, channelLongId, page) => {
-  logger.info(`getChannelClaims: ${channelName}, ${channelLongId}, ${page}`);
+  logger.debug(`getChannelClaims: ${channelName}, ${channelLongId}, ${page}`);
   let channelShortId = await chainquery.claim.queries.getShortClaimIdFromLongClaimId(
     channelLongId,
     channelName
diff --git a/server/controllers/api/claim/publish/index.js b/server/controllers/api/claim/publish/index.js
index a14f430d..f08bf76b 100644
--- a/server/controllers/api/claim/publish/index.js
+++ b/server/controllers/api/claim/publish/index.js
@@ -5,7 +5,7 @@ const {
   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 },
diff --git a/server/controllers/api/claim/update/index.js b/server/controllers/api/claim/update/index.js
index 73d24750..bca37d6d 100644
--- a/server/controllers/api/claim/update/index.js
+++ b/server/controllers/api/claim/update/index.js
@@ -129,7 +129,7 @@ const claimUpdate = ({ body, files, headers, ip, originalUrl, user, tor }, res)
           description: claimRecord.description,
           nsfw: claimRecord.nsfw,
           license: claimRecord.license,
-          license_url: claimRecord.license_url,
+          licenseUrl: claimRecord.license_url,
           language: 'en',
           author: details.title,
         },
@@ -170,12 +170,10 @@ const claimUpdate = ({ body, files, headers, ip, originalUrl, user, tor }, res)
       }
 
       const fp = files && files.file && files.file.path ? files.file.path : undefined;
-      logger.info(`before updatepublish`);
       return publish(publishParams, fileName, fileType, fp);
     })
     .then(result => {
       publishResult = result;
-      logger.info(`after updatepublish then`, result);
 
       if (channelName) {
         return chainquery.claim.queries.getShortClaimIdFromLongClaimId(
diff --git a/server/controllers/assets/utils/serveFile.js b/server/controllers/assets/utils/serveFile.js
index dce8f984..5efa9e32 100644
--- a/server/controllers/assets/utils/serveFile.js
+++ b/server/controllers/assets/utils/serveFile.js
@@ -1,5 +1,6 @@
 const logger = require('winston');
 const transformImage = require('./transformImage');
+
 const serveFile = async ({ filePath, fileType }, res, originalUrl) => {
   const queryObject = {};
   // TODO: replace quick/dirty try catch with better practice
diff --git a/utils/createModuleAliases.js b/utils/createModuleAliases.js
index eea3edb4..47560faa 100644
--- a/utils/createModuleAliases.js
+++ b/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;
 };
-- 
2.45.3