Merge branch 'maintenance-3.1.x' into 2023-snapshot-gnerate

nuxeo · Nov 28, 2024 · 3cee50a · 3cee50a
2 parents c76394e + cfca205
commit 3cee50a
Show file tree

Hide file tree

Showing 23 changed files with 44 additions and 37 deletions.
diff --git a/.env.sample b/.env.sample
@@ -1,4 +1,4 @@
-NUXEO_WEB_UI_VERSION=3.1.14-SNAPSHOT
+NUXEO_WEB_UI_VERSION=3.1.15-SNAPSHOT
 NUXEO_VERSION=master
 NUXEO_PACKAGES=nuxeo-drive nuxeo-liveconnect nuxeo-template-rendering
 NUXEO_DEV_MODE=true

diff --git a/charts/preview/Chart.yaml b/charts/preview/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
 description: A Helm chart for Web UI preview
 icon: https://media.licdn.com/dms/image/C4D0BAQFPXiXFrp4LBA/company-logo_200_200/0?e=2159024400&v=beta&t=RW9EU0QUciUVuPSpLySd9FtJ2yG-O37_hAAvc32f6ro
 name: preview
-version: 3.1.14-SNAPSHOT
+version: 3.1.15-SNAPSHOT
diff --git a/elements/nuxeo-app.js b/elements/nuxeo-app.js
@@ -539,6 +539,10 @@ Polymer({
       value: '52px',
     },
 
+    sidebarWidth: {
+      type: String,
+    },
+
     drawerOpened: {
       type: Boolean,
       value: false,
@@ -638,7 +642,7 @@ Polymer({
 
   ready() {
     this.$.drawerPanel.closeDrawer();
-
+    this.drawerWidth = this.sidebarWidth = getComputedStyle(this).getPropertyValue('--nuxeo-sidebar-width');
     this.$.drawerPanel.$.drawer.addEventListener('transitionend', () => {
       this.$.drawerPanel.notifyResize();
     });
@@ -1001,7 +1005,8 @@ Polymer({
   },
 
   _openDrawer() {
-    this.drawerWidth = '350px';
+    const pixelsSuffix = 'px';
+    this.drawerWidth = 298 + Math.round(this.sidebarWidth.substring(0, this.sidebarWidth.length - 2)) + pixelsSuffix;
     this.drawerOpened = true;
     const { drawerPanel } = this.$;
     if (drawerPanel.narrow) {
@@ -1017,7 +1022,7 @@ Polymer({
   },
 
   _closeDrawer() {
-    this.drawerWidth = '52px';
+    this.drawerWidth = this.sidebarWidth;
     this.drawerOpened = false;
     this.$.drawerPanel.closeDrawer();
     this.selectedTab = '';

diff --git a/ftest/features/publication.feature b/ftest/features/publication.feature
@@ -156,4 +156,4 @@ Feature: Internal Publication
     Then I can see the document is a publication
     And I cannot see to publication pill
     And I can unpublish the document
-    And I can see the document has 2 children    
+    And I can see the document has 2 children    
diff --git a/ftest/pom.xml b/ftest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.nuxeo.web.ui</groupId>
     <artifactId>nuxeo-web-ui-parent</artifactId>
-    <version>3.1.14-SNAPSHOT</version>
+    <version>3.1.15-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "repository": "nuxeo/nuxeo-web-ui.git",
   "homepage": "http://www.nuxeo.com",
   "name": "@nuxeo/nuxeo-web-ui",
-  "version": "3.1.14-SNAPSHOT",
+  "version": "3.1.15-SNAPSHOT",
   "license": "Apache-2.0",
   "vendor": "Nuxeo",
   "engines": {
@@ -14,7 +14,7 @@
   },
   "devDependencies": {
     "@nuxeo/nuxeo-web-ui-ftest": "file:./packages/nuxeo-web-ui-ftest",
-    "@nuxeo/testing-helpers": "~3.1.14-rc",
+    "@nuxeo/testing-helpers": "~3.1.15-rc",
     "@open-wc/eslint-config": "^0.3.0",
     "@open-wc/karma-esm": "^2.13.21",
     "@open-wc/prettier-config": "^0.1.0",
@@ -109,9 +109,9 @@
     "@material/mwc-snackbar": "^0.26.1",
     "@nuxeo/chart-elements": "^4.0.0-nx.1",
     "@nuxeo/moment": "^2.24.0-nx.0",
-    "@nuxeo/nuxeo-dataviz-elements": "~3.1.14-rc",
-    "@nuxeo/nuxeo-elements": "~3.1.14-rc",
-    "@nuxeo/nuxeo-ui-elements": "~3.1.14-rc",
+    "@nuxeo/nuxeo-dataviz-elements": "~3.1.15-rc",
+    "@nuxeo/nuxeo-elements": "~3.1.15-rc",
+    "@nuxeo/nuxeo-ui-elements": "~3.1.15-rc",
     "@nuxeo/page": "^1.11.4-nx.0",
     "@polymer/app-layout": "^3.1.0",
     "@polymer/iron-a11y-announcer": "^3.2.0",

diff --git a/packages/nuxeo-web-ui-ftest/features/step_definitions/browser.js b/packages/nuxeo-web-ui-ftest/features/step_definitions/browser.js
@@ -252,7 +252,7 @@ Then(/^I can perform the following publications$/, async function(table) {
       check = override ? newCount === 1 : newCount > pubCount;
     }
     if (check) {
-      pubCount = page.publicationsCount;
+      pubCount = await page.publicationsCount;
     }
   }
 });

diff --git a/packages/nuxeo-web-ui-ftest/features/step_definitions/search.js b/packages/nuxeo-web-ui-ftest/features/step_definitions/search.js
@@ -199,11 +199,14 @@ Then('I edit the results columns to show {string}', async function(heading) {
 });
 
 Then(/^I save my search as "(.+)"$/, async function(searchName) {
-  const saveAsButton = await this.ui.searchResults.saveSearchAsButton;
+  const searchResults = await this.ui.searchResults;
+  const saveAsButton = await searchResults.saveSearchAsButton;
   await saveAsButton.waitForVisible();
   await saveAsButton.click();
-  await this.ui.searchResults.enterInput(searchName);
-  const confirmSaveButton = await this.ui.searchResults.confirmSaveSearchButton;
+  await driver.pause(2000);
+  await searchResults.enterInput(searchName);
+  await driver.pause(2000);
+  const confirmSaveButton = await searchResults.confirmSaveSearchButton;
   await confirmSaveButton.click();
 });
 

diff --git a/packages/nuxeo-web-ui-ftest/package.json b/packages/nuxeo-web-ui-ftest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nuxeo/nuxeo-web-ui-ftest",
-  "version": "3.1.14-SNAPSHOT",
+  "version": "3.1.15-SNAPSHOT",
   "bin": {
     "nuxeo-web-ui-ftest": "./bin/nuxeo-web-ui-ftest.js"
   },

diff --git a/packages/nuxeo-web-ui-ftest/pages/ui/admin/cloudServices.js b/packages/nuxeo-web-ui-ftest/pages/ui/admin/cloudServices.js
@@ -157,6 +157,8 @@ export default class CloudServices extends BasePage {
   }
 
   async deleteClient(clientId) {
+    const dataTable = await driver.$('nuxeo-data-table nuxeo-data-table-row [name="id"]');
+    await dataTable.waitForVisible();
     const rows = await browser.$$('nuxeo-data-table[name="table"] nuxeo-data-table-row:not([header])');
     const deleted = await browser
       .$$('nuxeo-data-table[name="table"] nuxeo-data-table-row:not([header])')

diff --git a/packages/nuxeo-web-ui-ftest/pages/ui/browser/document_page.js b/packages/nuxeo-web-ui-ftest/pages/ui/browser/document_page.js
@@ -88,13 +88,8 @@ export default class DocumentPage extends BasePage {
           }
         }
         if (pub) {
-          return parseInt(
-            pub
-              .$('div')
-              .getText()
-              .trim(),
-            10,
-          );
+          const pubText = await pub.$('div').getText();
+          return parseInt(pubText.trim(), 10);
         }
       }
       return 0;

diff --git a/packages/nuxeo-web-ui-ftest/pages/ui/browser/document_publications.js b/packages/nuxeo-web-ui-ftest/pages/ui/browser/document_publications.js
@@ -31,7 +31,8 @@ export default class DocumentPublications extends BasePage {
     let index;
     for (let i = 0; i < rows.length; i++) {
       const row = rows[i];
-      if (row.isVisible('nuxeo-data-table-cell a.path')) {
+      const isRowVisible = await row.isVisible('nuxeo-data-table-cell a.path');
+      if (isRowVisible) {
         const foundPathEle = await row.$('nuxeo-data-table-cell a.path');
         const foundPath = await foundPathEle.getText();
         const foundPathLowerCase = await foundPath.trim().toLowerCase();

diff --git a/packages/nuxeo-web-ui-ftest/pages/ui/browser/document_versions.js b/packages/nuxeo-web-ui-ftest/pages/ui/browser/document_versions.js
@@ -95,7 +95,8 @@ export default class DocumentVersions extends BasePage {
       return true;
     }
     const listItems = await this.listItems;
-    await listItems.$('div[name="version-item"] .title').waitForVisible();
+    const versionItem = await listItems.$('div[name="version-item"] .title');
+    await versionItem.waitForVisible();
     const listItems1 = await this.listItems.$$('div[name="version-item"]');
     const itemsTitle = await browser.$$('div[name="version-item"]').map((img) => img.$('.title').getText());
     const index = itemsTitle.findIndex((currenTitle) => currenTitle === label);

diff --git a/packages/nuxeo-web-ui-ftest/pages/ui/search.js b/packages/nuxeo-web-ui-ftest/pages/ui/search.js
@@ -66,8 +66,9 @@ export default class Search extends Results {
     return dropdownElenent;
   }
 
-  enterInput(text) {
-    return driver.keys(text);
+  async enterInput(text) {
+    const isInputEntered = await driver.keys(text);
+    return isInputEntered;
   }
 
   async getField(field) {

diff --git a/packages/nuxeo-web-ui-ftest/wdio.conf.js b/packages/nuxeo-web-ui-ftest/wdio.conf.js
@@ -27,7 +27,7 @@ const capability = {
   maxInstances: 1,
   browserName: process.env.BROWSER,
   acceptInsecureCerts: true,
-  browserVersion: 'stable',
+  browserVersion: '130.0.6723.116',
 };
 
 const options = {};

diff --git a/plugin/a11y/pom.xml b/plugin/a11y/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.nuxeo.web.ui</groupId>
     <artifactId>nuxeo-web-ui-parent</artifactId>
-    <version>3.1.14-SNAPSHOT</version>
+    <version>3.1.15-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

diff --git a/plugin/a11y/wdio.conf.js b/plugin/a11y/wdio.conf.js
@@ -28,7 +28,6 @@ const capability = {
 };
 const options = {
   args: ['--no-sandbox'],
-  w3c: false,
 };
 if (process.env.HEADLESS) {
   options.args.push('--window-size=1920,1080');

diff --git a/plugin/itests/addon/pom.xml b/plugin/itests/addon/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.nuxeo.web.ui</groupId>
     <artifactId>nuxeo-web-ui-parent</artifactId>
-    <version>3.1.14-SNAPSHOT</version>
+    <version>3.1.15-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 

diff --git a/plugin/itests/marketplace/pom.xml b/plugin/itests/marketplace/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.nuxeo.web.ui</groupId>
     <artifactId>nuxeo-web-ui-parent</artifactId>
-    <version>3.1.14-SNAPSHOT</version>
+    <version>3.1.15-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 

diff --git a/plugin/metrics/pom.xml b/plugin/metrics/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.nuxeo.web.ui</groupId>
     <artifactId>nuxeo-web-ui-parent</artifactId>
-    <version>3.1.14-SNAPSHOT</version>
+    <version>3.1.15-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

diff --git a/plugin/web-ui/addon/pom.xml b/plugin/web-ui/addon/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.nuxeo.web.ui</groupId>
     <artifactId>nuxeo-web-ui-parent</artifactId>
-    <version>3.1.14-SNAPSHOT</version>
+    <version>3.1.15-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 

diff --git a/plugin/web-ui/marketplace/pom.xml b/plugin/web-ui/marketplace/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.nuxeo.web.ui</groupId>
     <artifactId>nuxeo-web-ui-parent</artifactId>
-    <version>3.1.14-SNAPSHOT</version>
+    <version>3.1.15-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 

diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
   <packaging>pom</packaging>
   <name>Nuxeo Web UI - Parent</name>
   <description>Nuxeo Web UI - Parent</description>
-  <version>3.1.14-SNAPSHOT</version>
+  <version>3.1.15-SNAPSHOT</version>
 
   <properties>
     <nuxeo.target.version>2023.*</nuxeo.target.version>