From 8d7fbf5a470edb50419d17387662811db445f2dd Mon Sep 17 00:00:00 2001
From: Mathias Jakobsen <mathias.jakobsen@overleaf.com>
Date: Thu, 18 Jan 2024 11:39:37 +0000
Subject: [PATCH] Merge pull request #16522 from
 overleaf/mj-table-generator-cypress-tests

[web] Add cypress tests for table generator

GitOrigin-RevId: c77454763cfc83e4869e75ba247369e6255a0553
---
 .../web/frontend/extracted-translations.json  |   1 +
 .../toolbar/column-width-modal/modal.tsx      |   6 +-
 .../frontend/js/shared/components/select.tsx  |  10 +-
 services/web/locales/en.json                  |   1 +
 ...codemirror-editor-table-generator.spec.tsx | 120 ++++++++++++++++++
 5 files changed, 135 insertions(+), 3 deletions(-)

diff --git a/services/web/frontend/extracted-translations.json b/services/web/frontend/extracted-translations.json
index bd306c8afd..bfec3a2031 100644
--- a/services/web/frontend/extracted-translations.json
+++ b/services/web/frontend/extracted-translations.json
@@ -643,6 +643,7 @@
   "leave_now": "",
   "leave_projects": "",
   "left": "",
+  "length_unit": "",
   "let_us_know": "",
   "library": "",
   "license_for_educational_purposes": "",
diff --git a/services/web/frontend/js/features/source-editor/components/table-generator/toolbar/column-width-modal/modal.tsx b/services/web/frontend/js/features/source-editor/components/table-generator/toolbar/column-width-modal/modal.tsx
index d5101e7b22..bbed2fefe4 100644
--- a/services/web/frontend/js/features/source-editor/components/table-generator/toolbar/column-width-modal/modal.tsx
+++ b/services/web/frontend/js/features/source-editor/components/table-generator/toolbar/column-width-modal/modal.tsx
@@ -151,7 +151,11 @@ const ColumnWidthModalBody = () => {
             </FormGroup>
             <FormGroup className="col-md-4 mb-0">
               <Select
-                label="&nbsp;"
+                label={
+                  <>
+                    &nbsp;<span className="sr-only">{t('length_unit')}</span>
+                  </>
+                }
                 items={UNITS}
                 itemToKey={x => x ?? ''}
                 itemToString={x => (x === 'custom' ? t('custom') : x ?? '')}
diff --git a/services/web/frontend/js/shared/components/select.tsx b/services/web/frontend/js/shared/components/select.tsx
index 271896a34e..af06a563e9 100644
--- a/services/web/frontend/js/shared/components/select.tsx
+++ b/services/web/frontend/js/shared/components/select.tsx
@@ -1,6 +1,12 @@
 /* eslint-disable jsx-a11y/label-has-for */
 /* eslint-disable jsx-a11y/label-has-associated-control */
-import { useRef, useEffect, KeyboardEventHandler, useCallback } from 'react'
+import {
+  useRef,
+  useEffect,
+  KeyboardEventHandler,
+  useCallback,
+  ReactNode,
+} from 'react'
 import classNames from 'classnames'
 import { useSelect } from 'downshift'
 import Icon from './icon'
@@ -12,7 +18,7 @@ export type SelectProps<T> = {
   // Stringifies an item of type T. The resulting string is rendered as a dropdown option.
   itemToString: (item: T | null | undefined) => string
   // Caption for the dropdown.
-  label?: string
+  label?: ReactNode
   // Attribute used to identify the component inside a Form. This name is used to
   // retrieve FormData when the form is submitted. The value of the FormData entry
   // is the string returned by `itemToString(selectedItem)`.
diff --git a/services/web/locales/en.json b/services/web/locales/en.json
index b491d6e7f9..8182218b7b 100644
--- a/services/web/locales/en.json
+++ b/services/web/locales/en.json
@@ -978,6 +978,7 @@
   "leave_now": "Leave now",
   "leave_projects": "Leave Projects",
   "left": "Left",
+  "length_unit": "Length unit",
   "let_us_know": "Let us know",
   "let_us_know_what_you_think": "Let us know what you think",
   "library": "Library",
diff --git a/services/web/test/frontend/features/source-editor/components/codemirror-editor-table-generator.spec.tsx b/services/web/test/frontend/features/source-editor/components/codemirror-editor-table-generator.spec.tsx
index e53e980260..63f835de31 100644
--- a/services/web/test/frontend/features/source-editor/components/codemirror-editor-table-generator.spec.tsx
+++ b/services/web/test/frontend/features/source-editor/components/codemirror-editor-table-generator.spec.tsx
@@ -1,7 +1,10 @@
+// Needed since eslint gets confused by mocha-each
+/* eslint-disable mocha/prefer-arrow-callback */
 import { FC } from 'react'
 import { EditorProviders } from '../../../helpers/editor-providers'
 import CodemirrorEditor from '../../../../../frontend/js/features/source-editor/components/codemirror-editor'
 import { mockScope } from '../helpers/mock-scope'
+import forEach from 'mocha-each'
 
 const Container: FC = ({ children }) => (
   <div style={{ width: 1000, height: 800 }}>{children}</div>
@@ -498,7 +501,124 @@ cell 3 & cell 4 \\\\
         .contains('button', 'Caption above')
         .should('be.disabled')
     })
+
+    describe('Fixed width columns', function () {
+      it('Can add fixed width columns', function () {
+        // Check that no column indicators exist
+        mountEditor(`
+        \\begin{tabular}{cc}
+        cell 1 & cell 2\\\\
+        cell 3 & cell 4 \\\\
+        \\end{tabular}`)
+        cy.get('.table-generator-column-indicator-label').should('not.exist')
+        cy.get('.table-generator-cell').eq(0).as('cell')
+        // Activate the table
+        cy.get('@cell').click()
+        cy.get('.table-generator-floating-toolbar')
+          .as('toolbar')
+          .should('exist')
+        // Select the second column
+        cy.get('.column-selector').eq(1).click()
+        cy.get('@toolbar').findByLabelText('Adjust column width').click()
+        cy.get('.table-generator-toolbar-dropdown-menu')
+          .findByText('Fixed width, wrap text')
+          .click()
+        // The modal should be open
+        cy.get('.table-generator-width-modal').as('modal').should('be.visible')
+        // The width input should be focused
+        cy.get('@modal')
+          .get('#column-width-modal-width')
+          .should('be.focused')
+          .type('20')
+        // Change the unit to inches
+        cy.get('@modal').findAllByLabelText('Length unit').first().click()
+        cy.get('@modal')
+          .findByRole('listbox')
+          .as('dropdown')
+          .should('be.visible')
+        cy.get('@dropdown').findByText('in').click()
+        // Confirm the change
+        cy.get('@modal').findByText('OK').click()
+        // Modal should close
+        cy.get('@modal').should('not.exist')
+        // Check that the width is applied to the right column
+        cy.get('.table-generator-column-widths-row td')
+          // 3rd element (buffer, column 1, column 2)
+          .eq(2)
+          .should('contain.text', '20in')
+      })
+
+      forEach([
+        ['20in', 'in'],
+        ['20', 'Custom'],
+        ['\\foobar', 'Custom'],
+      ]).it(
+        `Understands '%s' width descriptor`,
+        function (width, expectedUnit) {
+          // Check that no column indicators exist
+          mountEditor(`
+          \\begin{tabular}{cp{${width}}}
+          cell 1 & cell 2\\\\
+          cell 3 & cell 4 \\\\
+          \\end{tabular}`)
+          // Activate the table
+          cy.get('.table-generator-cell').eq(0).click()
+          // Click the column width indicator
+          cy.get('.table-generator-column-indicator-label').click()
+          // The modal should be open
+          cy.get('.table-generator-width-modal')
+            .as('modal')
+            .should('be.visible')
+          cy.get('@modal')
+            .findAllByLabelText('Length unit')
+            .first()
+            .should('have.text', expectedUnit)
+          cy.get('@modal').findByText('Cancel').click()
+        }
+      )
+
+      it(`It can justify fixed width cells`, function () {
+        // Check that no column indicators exist
+        mountEditor(`
+        \\begin{tabular}{>{\\raggedright\\arraybackslash}p{2cm}c}
+        cell 1 & cell 2\\\\
+        cell 3 & cell 4 \\\\
+        \\end{tabular}`)
+        // Activate the table
+        cy.get('.table-generator-cell').eq(0).click()
+        cy.get('.table-generator-floating-toolbar')
+          .as('toolbar')
+          .should('exist')
+        // Select the first column
+        cy.get('.column-selector').first().click()
+        // Verify current alignment is left, and open the menu
+        cy.get('@toolbar')
+          .findByLabelText('Alignment')
+          .should('not.be.disabled')
+          .should('contain.text', 'format_align_left')
+          .click()
+        // Change to justified alignment
+        cy.get('.table-generator').findByLabelText('Justify').click()
+        // Verify that alignment icon and class alignments were updated
+        cy.get('@toolbar')
+          .findByLabelText('Alignment')
+          .should('contain.text', 'format_align_justify')
+        cy.get('.table-generator-cell')
+          .eq(0)
+          .should('have.class', 'alignment-paragraph')
+        cy.get('.table-generator-cell')
+          .eq(1)
+          .should('have.class', 'alignment-center')
+        cy.get('.table-generator-cell')
+          .eq(2)
+          .should('have.class', 'alignment-paragraph')
+        cy.get('.table-generator-cell')
+          .eq(3)
+          .should('have.class', 'alignment-center')
+      })
+    })
   })
+
   describe('Tabular interactions', function () {
     it('Can type into cells', function () {
       mountEditor(`