Hotfix/code export fixes

frontend/src/modules/files/components/files-table/styles.css

@@ -2,6 +2,10 @@
   border-bottom: none !important;
 }
 
+.container th {
+  font-size: 13px !important;
+}
+
 .startCell {
   padding-left: 10px;
 }
@@ -23,7 +27,6 @@
   margin-right: 10px;
 }
 
-
 .removeButton {
   display: flex;
   align-items: center;

frontend/src/modules/output-checker/components/request/sidebar.jsx

@@ -13,6 +13,7 @@ import startCase from 'lodash/startCase';
 import SelectClearIcon from '@atlaskit/icon/glyph/select-clear';
 import { RequestSchema } from '@src/modules/requests/types';
 import { _e } from '@src/utils';
+import { uid } from 'react-uid';
 
 import * as styles from './styles.css';
 
@@ -59,6 +60,15 @@ function Sidebar({
             {startCase(get(data, 'exportType', 'data'))}
           </span>
         </div>
+        <h6>Projects</h6>
+        <div id="request-projects">
+          {data.projects &&
+            data.projects.map(p => (
+              <p key={uid(p)} className="request-project-text">
+                {p}
+              </p>
+            ))}
+        </div>
         <h6>Reviewers</h6>
         {data.reviewers.length > 0 && (
           <p id="request-assigned-oc">{assignedUser}</p>

frontend/src/modules/reports/components/main/index.jsx

@@ -44,10 +44,12 @@ function ReportsMain({
             <header className={styles.header}>
               <h2>
                 Dashboard
-                <small>{`Filtering from ${format(
-                  startDate,
-                  titleDateFormat
-                )} to ${format(endDate, titleDateFormat)}`}</small>
+                <small>
+                  {`Filtering from ${format(
+                    startDate,
+                    titleDateFormat,
+                  )} to ${format(endDate, titleDateFormat)}`}
+                </small>
               </h2>
             </header>
             <Filters
@@ -83,7 +85,7 @@ function ReportsMain({
         </Grid>
         <Grid layout="fluid">
           <GridColumn medium={12}>
-            <div id="reports-list-table">
+            <div id="reports-list-table" className={styles.table}>
               <DynamicTableStateless
                 emptyView={<Empty />}
                 head={head}
@@ -95,12 +97,6 @@ function ReportsMain({
                 onSort={sortProps => onSort(sortProps)}
               />
             </div>
-            <footer>
-              <small>
-                * Date an output checker either approved or requested revisions
-                for a request.
-              </small>
-            </footer>
           </GridColumn>
         </Grid>
       </Page>
@@ -121,7 +117,7 @@ ReportsMain.propTypes = {
       id: PropTypes.string,
       name: PropTypes.string,
       totalRequests: PropTypes.number,
-    })
+    }),
   ).isRequired,
   onRequestStateChange: PropTypes.func.isRequired,
   onSort: PropTypes.func.isRequired,

frontend/src/modules/reports/components/main/styles.css

@@ -7,7 +7,7 @@
 .header {
   margin-top: 20px;
   padding-bottom: 20px;
-  border-bottom: 2px solid #DFE1E6;
+  border-bottom: 2px solid #dfe1e6;
 }
 
 .header > * {
@@ -26,13 +26,18 @@
   margin: 20px 0 50px;
 }
 
+.projectsTable th,
+.table th {
+  font-size: 13px !important;
+}
+
 .filters {
   padding: 10px 0;
   margin: 0 0 10px;
   display: flex;
   align-items: center;
   justify-content: space-between;
-  border-bottom: 2px solid #DFE1E6;
+  border-bottom: 2px solid #dfe1e6;
 }
 
 .dateRange {
@@ -41,7 +46,7 @@
   align-items: center;
 }
 
-.dateRange div[role="presentation"] {
+.dateRange div[role='presentation'] {
   width: calc(50% - 15px);
 }
 

frontend/src/modules/requests/components/request-form/form.jsx

@@ -91,15 +91,12 @@ function NewRequestForm({
                   </Field>
                 ))}
             </FormSection>
-            {helpURL && (
-              <FormSection title="Additional help">
-                For guidance, please review the{' '}
-                <a href={helpURL} target="_blank" rel="noopener noreferrer">
-                  available documentation
-                </a>
-                .
-              </FormSection>
-            )}
+            <FormSection title="Additional help">
+              <p>
+                For guidance, please review the documentation in your project
+                folder.
+              </p>
+            </FormSection>
             <FormSection>
               <SectionMessage
                 appearance="warning"

frontend/src/modules/requests/components/request/index.jsx

@@ -1,6 +1,7 @@
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import cx from 'classnames';
+import CheckCircleIcon from '@atlaskit/icon/glyph/check-circle';
 import SectionMessage from '@atlaskit/section-message';
 import ExportTypeIcon from '@src/components/export-type-icon';
 import Page, { Grid, GridColumn } from '@atlaskit/page';
@@ -24,6 +25,7 @@ import RequestType from './request-type';
 import StateLabel from '../state-label';
 import Sidebar from '../../containers/sidebar';
 import { RequestSchema } from '../../types';
+import { validCode, failedCode } from '../../utils';
 import * as styles from './styles.css';
 
 class Request extends React.Component {
@@ -84,9 +86,11 @@ class Request extends React.Component {
     const isCodeExport = data.exportType === 'code';
     const mergeRequestStatusCode = get(data, 'mergeRequestStatus.code');
     const showMergeRequestError =
-      isCodeExport && mergeRequestStatusCode === 400;
+      isCodeExport && mergeRequestStatusCode === failedCode;
     const showMergeRequestLoading =
-      isCodeExport && mergeRequestStatusCode < 200;
+      isCodeExport && mergeRequestStatusCode < validCode;
+    const showMergeRequestComplete =
+      isCodeExport && mergeRequestStatusCode === validCode;
 
     return (
       <div id="requests-page">
@@ -154,7 +158,9 @@ class Request extends React.Component {
           <div id="request-details" className={styles.main}>
             <Grid>
               <GridColumn medium={9}>
-                {(showMergeRequestLoading || showMergeRequestError) &&
+                {(showMergeRequestComplete ||
+                  showMergeRequestLoading ||
+                  showMergeRequestError) &&
                   !isEditing && (
                     <div className={styles.mergeRequestStatus}>
                       {showMergeRequestLoading && (
@@ -163,6 +169,15 @@ class Request extends React.Component {
                           wait before submitting.
                         </SectionMessage>
                       )}
+                      {showMergeRequestComplete && data.state < 2 && (
+                        <SectionMessage
+                          appearance="confirmation"
+                          icon={CheckCircleIcon}
+                        >
+                          <strong>Merge Request Complete</strong>. Please submit
+                          your request.
+                        </SectionMessage>
+                      )}
                       {showMergeRequestError && (
                         <SectionMessage appearance="error">
                           {get(

frontend/src/modules/requests/components/request/sidebar.jsx

@@ -16,7 +16,12 @@ import SignInIcon from '@atlaskit/icon/glyph/sign-in';
 import SignOutIcon from '@atlaskit/icon/glyph/sign-out';
 import TrashIcon from '@atlaskit/icon/glyph/trash';
 
-import { duplicateRequest } from '../../utils';
+import {
+  duplicateRequest,
+  validCode,
+  invalidCode,
+  failedCode,
+} from '../../utils';
 import { RequestSchema } from '../../types';
 import * as styles from './styles.css';
 
@@ -50,18 +55,26 @@ function RequestSidebar({
       onWithdraw(data._id);
     }
   };
+  const mergeRequestStatusCode = get(
+    data,
+    'mergeRequestStatus.code',
+    invalidCode,
+  );
+  const validateEditButton = () => {
+    if (!isEditing && data.exportType === 'code') {
+      if (data.state > 1 || mergeRequestStatusCode <= validCode) {
+        return true;
+      }
+    }
+
+    return isSaving;
+  };
+
   const validate = () => {
     let isInvalid = isEditing || isSaving || data.state < 1;
     if (data.exportType === 'data') {
       isInvalid = data.files.length <= 0;
     } else if (data.exportType === 'code') {
-      const invalidCode = 100;
-      const failedCode = 400;
-      const mergeRequestStatusCode = get(
-        data,
-        'mergeRequestStatus.code',
-        invalidCode,
-      );
       isInvalid = !inRange(mergeRequestStatusCode, invalidCode, failedCode);
     }
 
@@ -80,6 +93,15 @@ function RequestSidebar({
           {startCase(get(data, 'exportType', 'data'))}
         </span>
       </div>
+      <h6>Projects</h6>
+      <div id="request-projects">
+        {data.projects &&
+          data.projects.map(p => (
+            <p key={uid(p)} className="request-project-text">
+              {p}
+            </p>
+          ))}
+      </div>
       <h6>Output Checker</h6>
       <div id="request-reviewers">
         {data.reviewers.map(d => (
@@ -92,17 +114,19 @@ function RequestSidebar({
       <h6>Actions</h6>
       {data.state >= 2 && data.state < 4 && (
         <React.Fragment>
-          <div>
-            <Button
-              appearance="link"
-              id="request-sidebar-withdraw-button"
-              isDisabled={isSaving}
-              iconBefore={<SignOutIcon />}
-              onClick={withdrawHandler}
-            >
-              Edit Request
-            </Button>
-          </div>
+          {data.exportType !== 'code' && (
+            <div>
+              <Button
+                appearance="link"
+                id="request-sidebar-withdraw-button"
+                isDisabled={isSaving}
+                iconBefore={<SignOutIcon />}
+                onClick={withdrawHandler}
+              >
+                Edit Request
+              </Button>
+            </div>
+          )}
           <div>
             <Button
               appearance="link"
@@ -134,7 +158,7 @@ function RequestSidebar({
               appearance="link"
               id="request-sidebar-edit-button"
               iconBefore={<EditFilledIcon />}
-              isDisabled={isSaving}
+              isDisabled={validateEditButton()}
               onClick={() => onEdit(data._id)}
             >
               {isEditing ? 'Done Editing' : 'Edit Request'}

frontend/src/modules/requests/components/requests-list/index.jsx

@@ -2,6 +2,7 @@ import * as React from 'react';
 import PropTypes from 'prop-types';
 import AttachmentIcon from '@atlaskit/icon/glyph/attachment';
 import Button, { ButtonGroup } from '@atlaskit/button';
+import CodeIcon from '@atlaskit/icon/glyph/code';
 import { Link } from 'react-router-dom';
 import Date from '@src/components/date';
 import { DynamicTableStateless } from '@atlaskit/dynamic-table';
@@ -116,10 +117,13 @@ function RequestsList({
         {
           content: (
             <div className={styles.actionsColumn}>
-              <div>
-                <AttachmentIcon size="small" />
-                {` ${get(d, 'files.length', 0)}`}
-              </div>
+              {d.exportType === 'code' && <CodeIcon />}
+              {d.exportType !== 'code' && (
+                <div>
+                  <AttachmentIcon size="small" />
+                  {` ${get(d, 'files.length', 0)}`}
+                </div>
+              )}
               <RequestMenu data={d} />
             </div>
           ),
@@ -207,7 +211,7 @@ function RequestsList({
       </header>
       <Grid>
         <GridColumn medium={12}>
-          <div id="requests-list-table">
+          <div id="requests-list-table" className={styles.table}>
             <DynamicTableStateless
               emptyView={renderEmpty()}
               head={header}
@@ -219,7 +223,7 @@ function RequestsList({
             />
             {isPaginationVisible && (
               <Pagination
-                fetch={fetchRequests}
+                onClick={fetchRequests}
                 isLastPage={data.length < limit * page}
                 page={page}
               />
@@ -237,7 +241,7 @@ RequestsList.propTypes = {
       _id: PropTypes.string,
       name: PropTypes.string,
       state: PropTypes.number,
-    })
+    }),
   ),
   fetchRequests: PropTypes.func.isRequired,
   filter: PropTypes.oneOfType([

frontend/src/modules/requests/components/requests-list/styles.css

@@ -7,7 +7,7 @@
   align-items: center;
   justify-content: space-between;
   padding: 0 0 15px;
-  border-bottom: 2px solid #DFE1E6;
+  border-bottom: 2px solid #dfe1e6;
 }
 
 .filters > div:last-child {
@@ -26,6 +26,10 @@
   text-decoration: underline;
 }
 
+.table th {
+  font-size: 13px !important;
+}
+
 .actionsColumn {
   display: flex;
   justify-content: space-between;

frontend/src/modules/requests/utils.js

@@ -7,6 +7,9 @@ import mapValues from 'lodash/mapValues';
 import { repositoryHost } from '@src/services/config';
 import { _e, getZoneString } from '@src/utils';
 
+export const validCode = 200;
+export const invalidCode = 100;
+export const failedCode = 400;
 // Form content
 export const formText = {
   data: {