Merge branch 'develop' of gitlab.coko.foundation:xpub/xpub-faraday into MenuCountry-improvement

packages/component-faraday-ui/src/ActionLink.js

@@ -34,6 +34,7 @@ const ActionLink = ({
       (iconPosition === 'left' && (
         <FontIconButton
           className={`${fontIcon} fontIconStyle`}
+          onClick={onClick}
           paddingBottom={paddingBottom}
           paddingRight={paddingRight}
           size={size}
@@ -50,6 +51,7 @@ const ActionLink = ({
       (iconPosition === 'right' && (
         <FontIconButton
           className={`${fontIcon} fontIconStyle`}
+          onClick={onClick}
           paddingBottom={paddingBottom}
           paddingRight={paddingRight}
           size={size}
@@ -109,12 +111,6 @@ const ExternalLink = styled.a`
   color: ${th('colorSecondary')};
   font-family: ${th('fontReading')};
   text-decoration: underline;
-
-  &:hover {
-    color: ${th('colorSecondary')};
-    font-family: ${th('fontReading')};
-    text-decoration: underline;
-  }
 `
 const CustomLink = ExternalLink.withComponent(Link)
 
@@ -122,6 +118,9 @@ const Root = styled.div`
   align-items: center;
   justify-content: center;
   display: ${props => (props.to ? 'inline-flex' : 'flex')};
+  &:hover * {
+    color: ${th('colorSecondary')};
+  }
 
   ${marginHelper};
   ${paddingHelper};

packages/component-faraday-ui/src/ManuscriptCard.js

@@ -75,7 +75,7 @@ const ManuscriptCard = ({
               </Text>
             )}
         </Row>
-        <Row alignItems="center" justify="flex-start">
+        <Row alignItems="center" height={5} justify="flex-start">
           <H4>Handling editor</H4>
           <Text ml={1} mr={3} whiteSpace="nowrap">
             {get(handlingEditor, 'name', 'Unassigned')}
@@ -99,7 +99,7 @@ const ManuscriptCard = ({
                   <DeleteIcon
                     fontIcon="deleteIcon"
                     onClick={showModal}
-                    paddingBottom={2}
+                    paddingBottom={1}
                     paddingRight={0}
                     size={1.65}
                   >
@@ -122,7 +122,7 @@ const ManuscriptCard = ({
         </Row>
       </MainContainer>
       <SideNavigation>
-        <IconButton fontIcon="arrowRight" iconSize={2} pl={0.4} />
+        <IconButton fontIcon="arrowRight" iconSize={2} pl={0.2} />
       </SideNavigation>
     </Root>
   )

packages/component-faraday-ui/src/manuscriptDetails/DeleteManuscriptModal.js

@@ -75,7 +75,7 @@ const DeleteManuscriptModal = props => (
       <DeleteIcon
         fontIcon="deleteIcon"
         onClick={showModal}
-        paddingBottom={2}
+        paddingBottom={1}
         paddingRight={0}
         size={1.65}
       >
@@ -94,7 +94,10 @@ DeleteManuscriptModal.defaultProps = {
 }
 
 // #region styles
-const DeleteIcon = styled(ActionLink)``
+const DeleteIcon = styled(ActionLink)`
+  cursor: default;
+  color: ${th('colorWarning')};
+`
 const Root = styled.div`
   align-items: center;
   background: ${th('colorBackgroundHue')};

packages/component-user/app/components/OpenUserForm.js

@@ -18,13 +18,7 @@ const OpenUserForm = ({ edit, user, onSubmit, modalKey }) => (
   >
     {showModal =>
       edit ? (
-        <IconButton
-          fontIcon="editIcon"
-          iconSize={2}
-          onClick={showModal}
-          paddingBottom={1.5}
-          pt={1 / 2}
-        />
+        <IconButton fontIcon="editIcon" iconSize={2} onClick={showModal} />
       ) : (
         <ActionLink icon="plus" onClick={showModal}>
           ADD USER

packages/component-wizard/src/components/SubmissionWizard.js

@@ -51,6 +51,7 @@ import { onChange, onSubmit, setInitialValues, validate } from './utils'
 const Wizard = ({
   step,
   history,
+  canEdit,
   journal,
   prevStep,
   isEditMode,
@@ -58,13 +59,12 @@ const Wizard = ({
   isFirstStep,
   handleSubmit,
   getButtonText,
-  isLastFragment,
   isFilesFetching,
   isAuthorsFetching,
   journal: { manuscriptTypes = [] },
   ...rest
 }) =>
-  isLastFragment ? (
+  canEdit ? (
     <Root className="wizard-root">
       <Steps currentStep={step}>
         {wizardSteps.map(({ stepTitle }) => (
@@ -89,12 +89,7 @@ const Wizard = ({
                 mr={1}
                 onClick={isFirstStep ? history.goBack : prevStep}
               >
-                <IconButton
-                  fontIcon="arrowLeft"
-                  mb={0.1}
-                  paddingBottom={1.2}
-                  paddingRight={0.9}
-                />
+                <IconButton fontIcon="arrowLeft" mb={0.1} pb={0.3} />
                 Back
               </Button>
               <Button
@@ -104,11 +99,7 @@ const Wizard = ({
                 primary
               >
                 {getButtonText()}
-                <IconButton
-                  fontIcon="arrowRight"
-                  mb={0.1}
-                  paddingBottom={0.5}
-                />
+                <IconButton fontIcon="arrowRight" mb={0.1} pb={0.1} />
               </Button>
             </Fragment>
           )}
@@ -189,8 +180,13 @@ export default compose(
         reduxAuthorError,
       isLastFragment:
         get(fragment, 'id', '') === last(get(collection, 'fragments', [])),
+      status: get(collection, 'status', ''),
     }),
   ),
+  withProps(({ status, isLastFragment }) => ({
+    canEdit:
+      isLastFragment && !(status === 'accepted' || status === 'rejected'),
+  })),
   withHandlers({
     getButtonText: ({ isLastStep, isEditMode }) => () => {
       if (isEditMode && isLastStep) {