Merge pull request #625 in DAT/ipr-client from release/v5.0.2 to master

* commit 'ac2368e18e4e62d9851c45b03c62e2e400075b9c':
  5.0.2
  Fix last ?. format in signature card
  Fix signature typing
  Use ts .? operator
  Match dates to old signature format
  Fix signatures using wrong date, render missing on sign

Author: creisle

app/components/SignatureCard/index.tsx

@@ -1,4 +1,4 @@
-import React, { useContext } from 'react';
+import React, { useContext, useState, useEffect } from 'react';
 import {
   Paper,
   Typography,
@@ -9,27 +9,39 @@ import GestureIcon from '@material-ui/icons/Gesture';
 import RemoveCircleIcon from '@material-ui/icons/RemoveCircle';
 
 import EditContext from '../EditContext';
+import { formatDate } from '../../utils/date';
 
 import './index.scss';
 
 const NON_BREAKING_SPACE = '\u00A0';
 
 type Props = {
   title: string,
-  signature: any | object,
-  onClick: Function,
+  signatures: null | Record<string, unknown | Record<string, unknown>>,
+  onClick: (arg0: boolean, arg1: string) => void,
   role: 'author' | 'reviewer',
   isPrint: boolean,
 };
 
 const SignatureCard: React.FC<Props> = ({
   title,
-  signature,
+  signatures,
   onClick,
   role,
   isPrint,
 }) => {
   const { canEdit } = useContext(EditContext);
+  const [userSignature, setUserSignature] = useState<Record<string, unknown>>({});
+
+  useEffect(() => {
+    if (signatures && role) {
+      if (role === 'author') {
+        setUserSignature(signatures.authorSignature);
+      } else {
+        setUserSignature(signatures.reviewerSignature);
+      }
+    }
+  }, [signatures, role]);
 
   const handleSign = () => {
     onClick(true, role);
@@ -46,11 +58,11 @@ const SignatureCard: React.FC<Props> = ({
           <Typography variant="body2" display="inline">
             {`${title}: `}
           </Typography>
-          {signature && signature.ident ? (
+          {userSignature?.ident ? (
             <Typography variant="body2" display="inline">
-              {signature.firstName}
+              {userSignature.firstName}
               {' '}
-              {signature.lastName}
+              {userSignature.lastName}
             </Typography>
           ) : (
             <Typography variant="body2" display="inline">
@@ -60,14 +72,12 @@ const SignatureCard: React.FC<Props> = ({
         </div>
         <div className="signatures-print__value">
           <Typography variant="body2" display="inline">
-            {`Date: `}
+            {'Date: '}
           </Typography>
-          {signature && signature.ident ? (
-              <Typography variant="body2" display="inline">
-                {signature.updatedAt
-                  ? signature.updatedAt
-                  : signature.createdAt}
-              </Typography>
+          {signatures?.ident ? (
+            <Typography variant="body2" display="inline">
+              {role === 'author' ? formatDate(signatures.authorSignedAt, true) : formatDate(signatures.reviewerSignedAt, true)}
+            </Typography>
           ) : (
             <Typography display="inline">
               {NON_BREAKING_SPACE}
@@ -84,14 +94,14 @@ const SignatureCard: React.FC<Props> = ({
         <Typography variant="body2">
           {title}
         </Typography>
-        {signature && signature.ident && (
+        {userSignature?.ident && (
           <Typography>
-            {signature.firstName}
+            {userSignature.firstName}
             {' '}
-            {signature.lastName}
+            {userSignature.lastName}
           </Typography>
         )}
-        {(!signature || !signature.ident) && canEdit && (
+        {!userSignature?.ident && canEdit && (
           <>
             <Button
               onClick={handleSign}
@@ -109,19 +119,17 @@ const SignatureCard: React.FC<Props> = ({
         <Typography variant="body2">
           Date
         </Typography>
-        {signature && signature.ident ? (
-            <Typography>
-              {signature.updatedAt
-                ? signature.updatedAt
-                : signature.createdAt}
-            </Typography>
+        {signatures?.ident ? (
+          <Typography>
+            {role === 'author' ? formatDate(signatures.authorSignedAt, true) : formatDate(signatures.reviewerSignedAt, true)}
+          </Typography>
         ) : (
           <Typography>
             {NON_BREAKING_SPACE}
           </Typography>
         )}
       </div>
-      {signature && signature.ident && canEdit && (
+      {userSignature?.ident && canEdit && (
         <div className="signatures__button">
           <IconButton
             size="small"

app/utils/date.js

@@ -13,15 +13,19 @@ const getDate = (time = true) => {
   return formattedDate.replace(', ', '__').replace(/:/g, '-');
 };
 
-const formatDate = (date) => {
+const formatDate = (date, long = false) => {
   const convertedDate = new Date(date);
   const formattedDate = new Intl.DateTimeFormat('en-ca', {
+    weekday: long ? 'long' : undefined,
+    month: long ? 'long' : '2-digit',
+    day: 'numeric',
     year: 'numeric',
-    month: '2-digit',
-    day: '2-digit',
+    hour: long ? '2-digit' : undefined,
+    minute: long ? '2-digit' : undefined,
+    hour12: false,
   }).format(convertedDate);
 
-  return formattedDate.replace(', ', '-');
+  return formattedDate;
 };
 
 export {

app/views/ReportView/components/AnalystComments/analyst-comments.pug

@@ -18,7 +18,7 @@ section.analyst
       div(flex=25, layout="column")
         h5 Author
         div(flex, layout="row")
-          span(ng-if="$ctrl.canEdit", ng-show="!$ctrl.signatures.authorSignature || !$ctrl.signatures", layout="row", layout-align="start center", ng-click="$ctrl.sign('author')").clickable
+          span(ng-if="$ctrl.canEdit", ng-show="!$ctrl.signatures.authorSignature.ident || !$ctrl.signatures", layout="row", layout-align="start center", ng-click="$ctrl.sign('author')").clickable
             md-icon(style="margin-right: 5px;") gesture
             span Sign
           span(ng-show="$ctrl.signatures.authorSignature.ident") {{$ctrl.signatures.authorSignature.firstName}} {{$ctrl.signatures.authorSignature.lastName}}
@@ -37,7 +37,7 @@ section.analyst
       div(flex=25, layout="column")
         h5 Reviewer
         div(flex, layout="row")
-          span(ng-if="$ctrl.canEdit", ng-show="!$ctrl.signatures.reviewerSignature || !$ctrl.signatures", layout="row", layout-align="start center", ng-click="$ctrl.sign('reviewer')").clickable
+          span(ng-if="$ctrl.canEdit", ng-show="!$ctrl.signatures.reviewerSignature.ident || !$ctrl.signatures", layout="row", layout-align="start center", ng-click="$ctrl.sign('reviewer')").clickable
             md-icon(style="margin-right: 5px;") gesture
             span Sign
           span(ng-show="$ctrl.signatures.reviewerSignature.ident") {{$ctrl.signatures.reviewerSignature.firstName}} {{$ctrl.signatures.reviewerSignature.lastName}}

app/views/ReportView/components/ProbeSummary/index.tsx

@@ -264,14 +264,14 @@ const ProbeSummary: React.FC<Props> = ({
           <div className={`${isPrint ? 'probe-summary__signatures' : ''}`}>
             <SignatureCard
               title={`${isPrint ? 'Manual Review' : 'Ready'}`}
-              signature={signatures ? signatures.authorSignature : null}
+              signatures={signatures}
               onClick={handleSign}
               role="author"
               isPrint={isPrint}
             />
             <SignatureCard
               title="Reviewer"
-              signature={signatures ? signatures.reviewerSignature : null}
+              signatures={signatures}
               onClick={handleSign}
               role="reviewer"
               isPrint={isPrint}

app/views/ReportView/components/Settings/report-settings.pug

@@ -36,7 +36,7 @@ section.meta
   div(layout="column", ng-if="!$ctrl.report.users.includes($ctrl.user)")
     md-subheader.md-no-sticky Analysis Status
     div(ng-if="$ctrl.report.analysisStartedAt").analysis__start
-      span Analysis started: {{$ctrl.formatDate($ctrl.report.analysisStartedAt)}}
+      span Analysis started: {{$ctrl.formatDate($ctrl.report.analysisStartedAt, true)}}
     md-tooltip(ng-if="!$ctrl.report.analysisStartedAt && !$ctrl.canStartAnalysis", md-direction="bottom") Only assigned users can start the analysis
     md-button(ng-click="$ctrl.startAnalysis()", ng-if="!$ctrl.report.analysisStartedAt", ng-disabled="!$ctrl.canStartAnalysis").md-accent Start Analysis
   md-subheader(ng-if="$ctrl.showBindings").md-no-sticky User Associations

package-lock.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "ipr-client",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "keywords": [],
   "license": "GPL-3.0",
   "sideEffects": false,