Merge branch 'master' into chore/performance

wri · Dec 10, 2024 · b8bdb55 · b8bdb55
2 parents 355f3b0 + 6e87824
commit b8bdb55
Show file tree

Hide file tree

Showing 12 changed files with 190 additions and 34 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -51,7 +51,7 @@ jobs:
       - name: Install API dependencies
         run: |
           sudo apt update --fix-missing
-          sudo apt-get -yqq install libpq-dev build-essential libcurl4-openssl-dev libgdal-dev
+          sudo apt-get -yqq install libpq-dev build-essential libcurl4-openssl-dev libgdal-dev imagemagick
           npm install -g mjml
 
       - name: Setup API Ruby

diff --git a/components/operators-detail/documentation/documents-certification.js b/components/operators-detail/documentation/documents-certification.js
@@ -63,6 +63,7 @@ function DocumentsCertification(props) {
                   user.operator_ids.includes(+id))) && (
                     <DocCardUpload
                       {...doc}
+                      title={intl.formatMessage({ id: 'operator-detail.license' })}
                       properties={{
                         type: 'operator',
                         id,

diff --git a/components/ui/confirm-modal.js b/components/ui/confirm-modal.js
@@ -0,0 +1,59 @@
+import React, { useState } from 'react';
+import { useIntl } from 'react-intl';
+
+import Spinner from 'components/ui/spinner';
+
+const ConfirmModal = ({
+  title,
+  text,
+  confirmText,
+  cancelText,
+  onCancel,
+  onConfirm
+}) => {
+  const intl = useIntl();
+  const [submitting, setSubmitting] = useState(false);
+  const [errorMessage, setErrorMessage] = useState(null);
+  const _cancelText = cancelText || intl.formatMessage({ id: 'cancel', defaultMessage: 'Cancel' });
+  const _confirmText = confirmText || intl.formatMessage({ id: 'confirm', defaultMessage: 'Confirm' });
+
+  const handleConfirm = () => {
+    setSubmitting(true);
+    onConfirm({
+      onSuccess: () => {
+        setErrorMessage(null);
+      },
+      onError: (errorMessage) => {
+        setSubmitting(false);
+        setErrorMessage(errorMessage);
+      }
+    });
+  };
+
+  return (
+    <div className="c-confirm-modal">
+      <Spinner
+        isLoading={submitting}
+        className="-tiny"
+      />
+
+      {title && <h2 className="c-title -extrabig">{title}</h2>}
+      <p className="c-text">
+        {text}
+      </p>
+      <p className="c-text -error">
+        {errorMessage}
+      </p>
+      <div className="actions">
+        <button className="c-button -primary" data-test-id="confirm-modal-cancel" onClick={onCancel}>
+          {_cancelText}
+        </button>
+        <button className="c-button -dangerous" data-test-id="confirm-modal-confirm" onClick={handleConfirm}>
+          {_confirmText}
+        </button>
+      </div>
+    </div>
+  )
+};
+
+export default ConfirmModal;
diff --git a/components/ui/doc-annex.js b/components/ui/doc-annex.js
@@ -1,13 +1,11 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-// import classnames from 'classnames';
 import Tooltip from 'rc-tooltip';
 import { useIntl } from 'react-intl';
 
 import Icon from 'components/ui/icon';
-import Spinner from 'components/ui/spinner';
 
-export default function DocAnnex({ annex, isRemoving, showRemoveButton, onRemove }) {
+export default function DocAnnex({ annex, showRemoveButton, visible, onRemove }) {
   const intl = useIntl();
   const formatDate = (date) => intl.formatDate(date, {
     day: '2-digit',
@@ -18,12 +16,12 @@ export default function DocAnnex({ annex, isRemoving, showRemoveButton, onRemove
   return (
     <Tooltip
       placement="bottom"
+      visible={visible}
       align={{
         offset: [0, 10],
       }}
       overlay={
         <div>
-          <Spinner isLoading={isRemoving} className="-tiny -transparent" />
           <h4 className="c-title -default tooltip-title"><strong>{annex.name}</strong></h4>
           <dl className="tooltip-content">
             <dt><strong>{intl.formatMessage({ id: 'annex.start_date' })}:</strong></dt>
@@ -68,6 +66,5 @@ DocAnnex.defaultProps = {
 DocAnnex.propTypes = {
   annex: PropTypes.object.isRequired,
   showRemoveButton: PropTypes.bool,
-  isRemoving: PropTypes.bool,
   onRemove: PropTypes.func
 }
diff --git a/components/ui/doc-card-upload.js b/components/ui/doc-card-upload.js
@@ -2,6 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import dayjs from 'dayjs';
+import * as Sentry from '@sentry/nextjs';
 
 import { connect } from 'react-redux';
 
@@ -15,18 +16,13 @@ import DocumentationService from 'services/documentationService';
 import modal from 'services/modal';
 
 // Components
+import ConfirmModal from 'components/ui/confirm-modal';
 import DocModal from 'components/ui/doc-modal';
-import Spinner from 'components/ui/spinner';
 
 class DocCardUpload extends React.Component {
   constructor(props) {
     super(props);
 
-    // STATE
-    this.state = {
-      deleteLoading: false,
-    };
-
     // BINDINGS
     this.triggerAddFile = this.triggerAddFile.bind(this);
     this.triggerEditFile = this.triggerEditFile.bind(this);
@@ -92,24 +88,43 @@ class DocCardUpload extends React.Component {
 
   triggerDeleteFile(e) {
     e && e.preventDefault();
-    const { docId } = this.props;
+    const { title, intl } = this.props;
+
+    modal.toggleModal(true, {
+      children: ConfirmModal,
+      childrenProps: {
+        title: intl.formatMessage({ id: 'delete.document.title', defaultMessage: 'Delete {document}?' }, { document: title }),
+        text: intl.formatMessage(
+          { id: 'delete.document.text', defaultMessage: 'Are you sure you want to delete document {document}?' }, { document: title }
+        ),
+        confirmText: intl.formatMessage({ id: 'delete', defaultMessage: 'Delete' }),
+        onConfirm: this.triggerConfirmedDeleteFile.bind(this),
+        onCancel: () => modal.toggleModal(false),
+      },
+      size: '-small'
+    });
+  }
 
-    this.setState({ deleteLoading: true });
+  triggerConfirmedDeleteFile({ onSuccess, onError } = {}) {
+    const { docId, intl } = this.props;
 
     this.documentationService.deleteDocument(docId)
       .then(() => {
-        this.setState({ deleteLoading: false });
+        modal.toggleModal(false);
+        onSuccess && onSuccess();
         this.props.onChange && this.props.onChange();
       })
       .catch((err) => {
-        this.setState({ deleteLoading: false });
+        onError && onError(
+          intl.formatMessage({ id: 'document.delete.error', defaultMessage: 'An error occurred while deleting the document.' })
+        );
+        Sentry.captureException(err);
         console.error(err);
       });
   }
 
   render() {
     const { status, buttons, date } = this.props;
-    const { deleteLoading } = this.state;
     const currentDate = dayjs(new Date());
     const selectedDate = dayjs(date);
     const isEditable = selectedDate.isSame(currentDate, 'day');
@@ -150,10 +165,6 @@ class DocCardUpload extends React.Component {
                   className="c-button -small -primary"
                 >
                   {this.props.intl.formatMessage({ id: 'delete' })}
-                  <Spinner
-                    isLoading={deleteLoading}
-                    className="-tiny -transparent"
-                  />
                 </button>
               </li>
             )}
@@ -212,6 +223,7 @@ class DocCardUpload extends React.Component {
 
 DocCardUpload.propTypes = {
   status: PropTypes.string,
+  title: PropTypes.string,
   user: PropTypes.object,
   docId: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
   onChange: PropTypes.func,

diff --git a/components/ui/doc-card.js b/components/ui/doc-card.js
@@ -1,6 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
+import * as Sentry from '@sentry/nextjs';
 
 // Intl
 import { connect } from 'react-redux';
@@ -11,6 +12,7 @@ import modal from 'services/modal';
 import DocumentationService from 'services/documentationService';
 
 // Components
+import ConfirmModal from 'components/ui/confirm-modal';
 import DocAnnexesModal from 'components/ui/doc-annexes-modal';
 import DocAnnex from 'components/ui/doc-annex';
 import Icon from 'components/ui/icon';
@@ -47,16 +49,15 @@ class DocCard extends React.Component {
   constructor(props) {
     super(props);
 
+    this.state = {
+      annexTooltipVisible: undefined
+    };
+
     this.documentationService = new DocumentationService({
       authorization: props.user.token
     });
   }
 
-  state = {
-    deleteLoading: false
-  }
-
-
   triggerWhy = (e) => {
     e && e.preventDefault();
     const { title, reason } = this.props;
@@ -125,23 +126,54 @@ class DocCard extends React.Component {
   }
 
   triggerRemoveAnnex = (id) => {
-    this.setState({ deleteLoading: true });
+    const { annexes, title, intl } = this.props;
+    const annex = annexes.find(a => a.id === id);
+
+    // workaround to close tooltip before opening modal, but show it again when hovering
+    this.setState({ annexTooltipVisible: false });
+    setTimeout(() => {
+      this.setState({ annexTooltipVisible: undefined });
+    });
+
+    modal.toggleModal(true, {
+      children: ConfirmModal,
+      childrenProps: {
+        title: intl.formatMessage({ id: 'delete.document.title', defaultMessage: 'Delete {document}?' }, { document: annex.name }),
+        text: intl.formatMessage(
+          { id: 'delete.document.text', defaultMessage: 'Are you sure you want to delete document {document}?' }, { document: annex.name }
+        ),
+        confirmText: intl.formatMessage({ id: 'delete', defaultMessage: 'Delete' }),
+        onConfirm: (options) => {
+          this.triggerConfirmedRemoveAnnex({ ...options, annexId: id });
+        },
+        onCancel: () => modal.toggleModal(false),
+      },
+      size: '-small'
+    });
+  }
+
+  triggerConfirmedRemoveAnnex({ annexId, onSuccess, onError } = {}) {
+    const { intl } = this.props;
 
-    this.documentationService.deleteAnnex(id)
+    this.documentationService.deleteAnnex(annexId)
       .then(() => {
-        this.setState({ deleteLoading: false });
+        modal.toggleModal(false);
+        onSuccess && onSuccess();
         this.props.onChange && this.props.onChange();
       })
       .catch((err) => {
-        this.setState({ deleteLoading: false });
+        onError && onError(
+          intl.formatMessage({ id: 'document.delete.error', defaultMessage: 'An error occurred while deleting the document.' })
+        );
+        Sentry.captureException(err);
         console.error(err);
       });
   }
 
   render() {
     const { user, adminComment, public: publicState, startDate, endDate, status, source, sourceInfo, title, explanation, url, annexes, layout, properties } = this.props;
     const { id } = properties;
-    const { deleteLoading } = this.state;
+    const { annexTooltipVisible } = this.state;
     const isActiveUser = (user && user.role === 'admin') ||
       (user && (user.role === 'operator' || user.role === 'holding') && user.operator_ids && user.operator_ids.includes(+id)) ||
       (user && user.role === 'government' && user.country && user.country.toString() === id);
@@ -223,7 +255,7 @@ class DocCard extends React.Component {
                   <ul className="doc-card-list">
                     {approvedAnnexes.map(annex => (
                       <li className="doc-card-list-item" key={annex.id}>
-                        <DocAnnex annex={annex} isRemoving={deleteLoading} showRemoveButton={isActiveUser} onRemove={this.triggerRemoveAnnex} />
+                        <DocAnnex annex={annex} showRemoveButton={isActiveUser} onRemove={this.triggerRemoveAnnex} visible={annexTooltipVisible} />
                       </li>
                     ))}
                     {isActiveUser &&
@@ -296,7 +328,7 @@ class DocCard extends React.Component {
                   <ul className="doc-card-list">
                     {approvedAnnexes.map(annex => (
                       <li className="doc-card-list-item" key={annex.id}>
-                        <DocAnnex annex={annex} isRemoving={deleteLoading} showRemoveButton={isActiveUser} onRemove={this.triggerRemoveAnnex} />
+                        <DocAnnex annex={annex} showRemoveButton={isActiveUser} onRemove={this.triggerRemoveAnnex} visible={annexTooltipVisible} />
                       </li>
                     ))}
                     {isActiveUser &&
@@ -363,7 +395,7 @@ class DocCard extends React.Component {
                   <ul className="doc-card-list">
                     {approvedAnnexes.map(annex => (
                       <li className="doc-card-list-item" key={annex.id}>
-                        <DocAnnex annex={annex} isRemoving={deleteLoading} showRemoveButton={isActiveUser} onRemove={this.triggerRemoveAnnex} />
+                        <DocAnnex annex={annex} showRemoveButton={isActiveUser} onRemove={this.triggerRemoveAnnex} visible={annexTooltipVisible} />
                       </li>
                     ))}
 

diff --git a/css/components/ui/_button.scss b/css/components/ui/_button.scss
@@ -67,6 +67,18 @@
     }
   }
 
+  &.-dangerous {
+    border-color: $color-error;
+    color: $color-text-2;
+    fill: $color-error;
+    background: $color-error;
+
+    &:hover {
+      color: darken($color-text-2, 10%);
+      fill: darken($color-text-2, 10%);
+    }
+  }
+
   &.-tertiary {
     border-color: $color-tertiary;
     color: $color-text-1;

diff --git a/css/components/ui/_confirm-modal.scss b/css/components/ui/_confirm-modal.scss
@@ -0,0 +1,19 @@
+.c-confirm-modal {
+  padding: 20px;
+
+  p {
+    font-size: $font-size-big;
+  }
+
+  p.-error {
+    color: $color-error;
+    font-size: $font-size-default;
+  }
+
+  .actions {
+    display: flex;
+    margin-top: 30px;
+    gap: 20px;
+    justify-content: flex-end;
+  }
+}
diff --git a/css/components/ui/_modal.scss b/css/components/ui/_modal.scss
@@ -113,6 +113,17 @@
     }
   }
 
+  &.-small {
+    .modal-container {
+      width: calc(100% - 20px);
+
+      @include breakpoint(medium) {
+        width: unset;
+        max-width: 600px;
+      }
+    }
+  }
+
   &.-auto {
     .modal-container {
       width: unset;

diff --git a/css/index.scss b/css/index.scss
@@ -56,6 +56,7 @@
 @import 'components/ui/chart';
 @import 'components/ui/chart-legend';
 @import 'components/ui/country-card';
+@import 'components/ui/confirm-modal';
 @import 'components/ui/datepicker';
 @import 'components/ui/doc-by-category';
 @import 'components/ui/doc-card';