Merge branch 'faraday-master' of gitlab.coko.foundation:xpub/xpub into faraday-master

.dockerignore

 packages/*/node_modules/**/*
 packages/*/node_modules
+packages/**/*.env
+packages/**/.env
+packages/**/config/local*.*

Dockerfile

@@ -13,12 +13,12 @@ RUN [ "yarn", "install", "--frozen-lockfile" ]
 RUN [ "yarn", "cache", "clean"]
 RUN [ "rm", "-rf", "/npm-packages-offline-cache"]
 
-ENV NODE_ENV "production"
+# ENV NODE_ENV "production"
 
 # We are temporarily going to use the same image with different commands to deploy different apps in the monorepo. This is bad :(.
 
-WORKDIR ${HOME}/packages/xpub-collabra
-RUN [ "npx", "pubsweet", "build"]
+# WORKDIR ${HOME}/packages/xpub-collabra
+# RUN [ "npx", "pubsweet", "build"]
 
 ## No xpub-ui to deploy yet
 # WORKDIR ${HOME}/packages/xpub-ui
@@ -26,7 +26,11 @@ RUN [ "npx", "pubsweet", "build"]
 ## Create file for kubernetes health checks
 # RUN touch ./styleguide/health
 
+ENV NODE_ENV "development"
+WORKDIR ${HOME}/packages/xpub-faraday
+RUN [ "npm", "run", "reset", "--username", "admin", "--email", "admin@mailinator.com", "--password", "admin123"]
+
 EXPOSE 3000
 
-WORKDIR ${HOME}
-CMD []
+# WORKDIR ${HOME}
+CMD ["npm", "run", "start-now"]

packages/components-faraday/src/components/Dashboard/DashboardCard.js

 import React from 'react'
+import PropTypes from 'prop-types'
 import { get, isEmpty } from 'lodash'
 import styled from 'styled-components'
 import { Button, Icon } from '@pubsweet/ui'
+import { compose, getContext } from 'recompose'
 
 import { parseVersion, getFilesURL, downloadAll } from './utils'
 
@@ -11,6 +13,8 @@ const DashboardCard = ({
   project,
   version,
   showAbstractModal,
+  journal,
+  ...rest
 }) => {
   const { submitted, title, type, version: vers } = parseVersion(version)
   const files = getFilesURL(get(version, 'files'))
@@ -18,7 +22,6 @@ const DashboardCard = ({
   const hasFiles = !isEmpty(files)
   const abstract = get(version, 'metadata.abstract')
   const metadata = get(version, 'metadata')
-
   return (
     <Card>
       <ListView>
@@ -65,8 +68,10 @@ const DashboardCard = ({
       </ListView>
       <DetailsView>
         <LeftDetails>
-          <JournalTitle>{metadata.journal}</JournalTitle>
-          <Issue>{metadata.issue}</Issue>
+          <JournalTitle>{journal.metadata.nameText}</JournalTitle>
+          <Issue>
+            {journal.issueTypes.find(t => t.value === metadata.issue).label}
+          </Issue>
           {get(version, 'authors') && (
             <Authors>
               <span>Authors:</span>
@@ -109,7 +114,7 @@ const DashboardCard = ({
   )
 }
 
-export default DashboardCard
+export default compose(getContext({ journal: PropTypes.object }))(DashboardCard)
 
 // #region styled-components
 const PreviewContainer = styled.div`
@@ -160,7 +165,7 @@ const ActionButtons = styled(Button)`
 
 const LeftDetails = styled.div`
   display: flex;
-  flex: 1;
+  flex: 3;
   flex-direction: column;
   justify-content: flex-start;
   padding: 10px 20px;
@@ -168,7 +173,7 @@ const LeftDetails = styled.div`
 
 const RightDetails = styled.div`
   display: flex;
-  flex: 1;
+  flex: 2;
   flex-direction: column;
 
   div {
@@ -340,8 +345,9 @@ const ClickableIconContainer = styled.div`
   align-items: center;
   cursor: pointer;
   display: flex;
+  margin-right: 8px;
 
-  & > span {
+  span:last-child {
     color: #667080;
     font-family: Helvetica;
     font-size: 14px;

packages/components-faraday/src/components/Dashboard/DashboardPage.js

 import { get } from 'lodash'
-import { compose } from 'recompose'
+import PropTypes from 'prop-types'
 import { connect } from 'react-redux'
 import { actions } from 'pubsweet-client'
+import { withJournal } from 'xpub-journal'
 import { ConnectPage } from 'xpub-connect'
 import { withRouter } from 'react-router-dom'
+import { compose, withContext } from 'recompose'
 import { newestFirst, selectCurrentUser } from 'xpub-selectors'
 import { createDraftSubmission } from 'pubsweet-component-wizard/src/redux/conversion'
 
@@ -48,6 +50,7 @@ export default compose(
     }),
   ),
   withRouter,
+  withJournal,
   withFilters({
     status: {
       options: [
@@ -82,4 +85,10 @@ export default compose(
       },
     },
   }),
+  withContext(
+    {
+      journal: PropTypes.object,
+    },
+    ({ journal }) => ({ journal }),
+  ),
 )(Dashboard)

packages/xpub-faraday/Dockerfile

+FROM bogdandev/xpub-faraday:21.02
\ No newline at end of file

packages/xpub-faraday/package.json

@@ -73,6 +73,7 @@
     "setupdb": "pubsweet setupdb ./",
     "reset": "pubsweet setupdb --clobber ./",
     "start": "pubsweet start",
+    "start-now": "echo $secret > config/local-development.json && npm run start",
     "build": "NODE_ENV=production pubsweet build"
   }
 }