Merge pull request #1515 from SenseNet/master

Release To Develop
SenseNet · Jun 23, 2023 · e2dd864 · e2dd864
2 parents baca193 + fa8d1a8
commit e2dd864
Show file tree

Hide file tree

Showing 61 changed files with 275 additions and 224 deletions.
diff --git a/apps/sensenet/cypress/e2e/breadcrumb/breadcrumb.cy.ts b/apps/sensenet/cypress/e2e/breadcrumb/breadcrumb.cy.ts
@@ -7,38 +7,37 @@ describe('breadcrumb', () => {
     cy.visit(
       pathWithQueryParams({
         path: resolvePathParams({ path: PATHS.content.appPath, params: { browseType: 'explorer' } }),
-        newParams: { repoUrl: Cypress.env('repoUrl'), path: '/IT/Document_Library' },
+        newParams: { repoUrl: Cypress.env('repoUrl'), path: '' },
       }),
     )
   })
 
   it('should contain the expected items', () => {
-    const expectedItems = ['Content', 'IT Workspace', 'Document library']
-
-    cy.get('[data-test^="breadcrumb-item-"]').should('have.length', expectedItems.length)
-
-    cy.get('[data-test^="breadcrumb-item-"]').each(($el, index) => {
-      expect(expectedItems[index]).to.equal($el.text())
-    })
+    cy.get('[data-test^="breadcrumb-item-"]').should('have.length', 1)
   })
 
   it('should navigate in the target folder on click', () => {
-    const documentLibrarySelector = '[data-test="breadcrumb-item-document-library"]'
+    cy.get('[data-test="menu-item-sample-workspace"]').click()
+    cy.get("[data-test='breadcrumb-item-sample-workspace']").should('exist')
+    cy.get('[data-test="menu-item-document-library"]').click({ force: true })
+    cy.get('[data-test="breadcrumb-item-document-library"]').as('docLibBreadCrumb').should('exist')
+    cy.get('[data-test="menu-item-memos"]').click({ force: true })
+    cy.get('[data-test="breadcrumb-item-memos"]').should('exist')
 
-    cy.get(documentLibrarySelector).should('exist')
-    cy.get('[data-test="breadcrumb-item-it-workspace"]').click()
-    cy.get('[data-test="breadcrumb-item-it-workspace"]').should('exist')
-    cy.get(documentLibrarySelector).should('not.exist')
+    cy.get('@docLibBreadCrumb').should('not.exist')
 
     cy.location().should((loc) => {
       const query = new URLSearchParams(loc.search)
-      expect(query.get('path')).to.eq('/IT')
+
+      console.log(query.get('path'))
+
+      expect(query.get('path')).to.eq('/SampleWorkspace/Memos')
     })
   })
 
   it('right click on a breadcrumb item should open its action menu', () => {
     cy.get('[data-test^="content-context-menu-"]').should('not.exist')
-    cy.get('[data-test="breadcrumb-item-it-workspace"]').rightclick()
+    cy.get('[data-test="breadcrumb-item-content"]').rightclick()
     cy.get('[data-test^="content-context-menu-"]').should('have.length.of.at.least', 1)
   })
 })
diff --git a/apps/sensenet/cypress/e2e/content-crud/calendar-event.cy.ts b/apps/sensenet/cypress/e2e/content-crud/calendar-event.cy.ts
@@ -7,7 +7,7 @@ describe('Calendar event', () => {
     cy.visit(
       pathWithQueryParams({
         path: resolvePathParams({ path: PATHS.content.appPath, params: { browseType: 'explorer' } }),
-        newParams: { repoUrl: Cypress.env('repoUrl'), path: '/IT/Calendar' },
+        newParams: { repoUrl: Cypress.env('repoUrl'), path: '/SampleWorkspace/Calendar' },
       }),
     )
   })

diff --git a/apps/sensenet/cypress/e2e/content-crud/document-library.cy.ts b/apps/sensenet/cypress/e2e/content-crud/document-library.cy.ts
@@ -7,7 +7,7 @@ describe('Link', () => {
     cy.visit(
       pathWithQueryParams({
         path: resolvePathParams({ path: PATHS.content.appPath, params: { browseType: 'explorer' } }),
-        newParams: { repoUrl: Cypress.env('repoUrl'), path: '/IT' },
+        newParams: { repoUrl: Cypress.env('repoUrl'), path: '/SampleWorkspace' },
       }),
     )
   })

diff --git a/apps/sensenet/cypress/e2e/content-crud/link-list.cy.ts b/apps/sensenet/cypress/e2e/content-crud/link-list.cy.ts
@@ -7,7 +7,7 @@ describe('Link list', () => {
     cy.visit(
       pathWithQueryParams({
         path: resolvePathParams({ path: PATHS.content.appPath, params: { browseType: 'explorer' } }),
-        newParams: { repoUrl: Cypress.env('repoUrl'), path: '/IT' },
+        newParams: { repoUrl: Cypress.env('repoUrl'), path: '/SampleWorkspace' },
       }),
     )
   })

diff --git a/apps/sensenet/cypress/e2e/content-crud/link.cy.ts b/apps/sensenet/cypress/e2e/content-crud/link.cy.ts
@@ -7,7 +7,7 @@ describe('Link', () => {
     cy.visit(
       pathWithQueryParams({
         path: resolvePathParams({ path: PATHS.content.appPath, params: { browseType: 'explorer' } }),
-        newParams: { repoUrl: Cypress.env('repoUrl'), path: '/IT/Links' },
+        newParams: { repoUrl: Cypress.env('repoUrl'), path: '/SampleWorkspace/Links' },
       }),
     )
   })

diff --git a/apps/sensenet/cypress/e2e/content-crud/memo-list.cy.ts b/apps/sensenet/cypress/e2e/content-crud/memo-list.cy.ts
@@ -7,7 +7,7 @@ describe('Memo list', () => {
     cy.visit(
       pathWithQueryParams({
         path: resolvePathParams({ path: PATHS.content.appPath, params: { browseType: 'explorer' } }),
-        newParams: { repoUrl: Cypress.env('repoUrl'), path: '/IT' },
+        newParams: { repoUrl: Cypress.env('repoUrl'), path: '/SampleWorkspace' },
       }),
     )
   })

diff --git a/apps/sensenet/cypress/e2e/content-crud/memo.cy.ts b/apps/sensenet/cypress/e2e/content-crud/memo.cy.ts
@@ -7,7 +7,7 @@ describe('Memo', () => {
     cy.visit(
       pathWithQueryParams({
         path: resolvePathParams({ path: PATHS.content.appPath, params: { browseType: 'explorer' } }),
-        newParams: { repoUrl: Cypress.env('repoUrl'), path: '/IT/Memos' },
+        newParams: { repoUrl: Cypress.env('repoUrl'), path: '/SampleWorkspace/Memos' },
       }),
     )
   })

diff --git a/apps/sensenet/cypress/e2e/content-crud/task.cy.ts b/apps/sensenet/cypress/e2e/content-crud/task.cy.ts
@@ -7,7 +7,7 @@ describe('Task', () => {
     cy.visit(
       pathWithQueryParams({
         path: resolvePathParams({ path: PATHS.content.appPath, params: { browseType: 'explorer' } }),
-        newParams: { repoUrl: Cypress.env('repoUrl'), path: '/IT/Tasks' },
+        newParams: { repoUrl: Cypress.env('repoUrl'), path: '/SampleWorkspace/Tasks' },
       }),
     )
   })

diff --git a/apps/sensenet/cypress/e2e/content-templates/create_delete_file.cy.ts b/apps/sensenet/cypress/e2e/content-templates/create_delete_file.cy.ts
@@ -10,7 +10,7 @@ describe('Create/Delete content', () => {
   })
   it('Creating a new file should work properly', () => {
     cy.get('[data-test="drawer-menu-item-content"]').click()
-    cy.get('[data-test="menu-item-it-workspace"]').click()
+    cy.get('[data-test="menu-item-sample-workspace"]').click()
     cy.get('[data-test="menu-item-document-library"]').click({ force: true })
     cy.get('[data-test="add-button"]').click()
     cy.get('[data-test="listitem-file"]')
@@ -25,9 +25,9 @@ describe('Create/Delete content', () => {
 
   it('File should be edited', () => {
     cy.get('[data-test="drawer-menu-item-content"]').click()
-    cy.get('[data-test="menu-item-it-workspace"]').click()
+    cy.get('[data-test="menu-item-sample-workspace"]').click()
     cy.get('[data-test="menu-item-document-library"]').click({ force: true })
-    cy.get(`[data-test="table-cell-${fileName.replace(/\s+/g, '-').toLowerCase()}"]`).rightclick()
+    cy.get(`[data-test="table-cell-${fileName.replace(/\s+/g, '-').toLowerCase()}"]`).rightclick({ force: true })
     cy.get('[data-test="content-context-menu-edit"]')
       .click()
       .then(() => {
@@ -44,9 +44,9 @@ describe('Create/Delete content', () => {
 
   it('File delete should work properly', () => {
     cy.get('[data-test="drawer-menu-item-content"]').click()
-    cy.get('[data-test="menu-item-it-workspace"]').click()
+    cy.get('[data-test="menu-item-sample-workspace"]').click({ force: true })
     cy.get('[data-test="menu-item-document-library"]').click({ force: true })
-    cy.get(`[data-test="table-cell-${newFileName.replace(/\s+/g, '-').toLowerCase()}"]`).rightclick()
+    cy.get(`[data-test="table-cell-${newFileName.replace(/\s+/g, '-').toLowerCase()}"]`).rightclick({ force: true })
     cy.get('[data-test="content-context-menu-delete"]')
       .click()
       .then(() => {

diff --git a/apps/sensenet/cypress/e2e/content-types/content-types.cy.ts b/apps/sensenet/cypress/e2e/content-types/content-types.cy.ts
@@ -37,7 +37,8 @@ describe('Content types', () => {
   context('create & delete', () => {
     it('should create a new content type', (done) => {
       cy.get('[data-test="add-button"]').should('not.be.disabled').click()
-      cy.get('[data-test="listitem-content-type"]')
+      cy.get('[data-test="list-items"]')
+        .eq(0)
         .click()
         .then(() => {
           cy.get('.monaco-editor textarea')
@@ -121,7 +122,8 @@ describe('Content types', () => {
     })
     it('it should insert presets', () => {
       cy.get('[data-test="add-button"]').should('not.be.disabled').click()
-      cy.get('[data-test="listitem-content-type"]')
+      cy.get('[data-test="list-items"]')
+        .eq(0)
         .click()
         .then(() => {
           defaultFieldSettings.forEach((field) => {

diff --git a/apps/sensenet/cypress/e2e/content/create_delete_content.cy.ts b/apps/sensenet/cypress/e2e/content/create_delete_content.cy.ts
@@ -9,7 +9,7 @@ describe('Create/Delete content', () => {
   })
   it('Creating a new folder should work properly', () => {
     cy.get('[data-test="drawer-menu-item-content"]').click()
-    cy.get('[data-test="menu-item-it-workspace"]').click()
+    cy.get('[data-test="menu-item-sample-workspace"]').click()
     cy.get('[data-test="add-button"]').click()
     cy.get('[data-test="listitem-folder"]')
       .click()
@@ -27,8 +27,8 @@ describe('Create/Delete content', () => {
 
   it('Folder delete should work properly', () => {
     cy.get('[data-test="drawer-menu-item-content"]').click()
-    cy.get('[data-test="menu-item-it-workspace"]').click()
-    cy.get(`[data-test="table-cell-${folderName.replace(/\s+/g, '-').toLowerCase()}"]`).rightclick()
+    cy.get('[data-test="menu-item-sample-workspace"]').click()
+    cy.get(`[data-test="table-cell-${folderName.replace(/\s+/g, '-').toLowerCase()}"]`).rightclick({ force: true })
     cy.get('[data-test="content-context-menu-delete"]')
       .click()
       .then(() => {

diff --git a/apps/sensenet/cypress/e2e/content/create_delete_file.cy.ts b/apps/sensenet/cypress/e2e/content/create_delete_file.cy.ts
@@ -10,7 +10,7 @@ describe('Create/Delete content', () => {
   })
   it('Creating a new file should work properly', () => {
     cy.get('[data-test="drawer-menu-item-content"]').click()
-    cy.get('[data-test="menu-item-it-workspace"]').click()
+    cy.get('[data-test="menu-item-sample-workspace"]').click()
     cy.get('[data-test="menu-item-document-library"]').click({ force: true })
     cy.get('[data-test="add-button"]').click()
     cy.get('[data-test="listitem-file"]')
@@ -25,9 +25,9 @@ describe('Create/Delete content', () => {
 
   it('File should be edited', () => {
     cy.get('[data-test="drawer-menu-item-content"]').click()
-    cy.get('[data-test="menu-item-it-workspace"]').click()
+    cy.get('[data-test="menu-item-sample-workspace"]').click()
     cy.get('[data-test="menu-item-document-library"]').click({ force: true })
-    cy.get(`[data-test="table-cell-${fileName.replace(/\s+/g, '-').toLowerCase()}"]`).rightclick()
+    cy.get(`[data-test="table-cell-${fileName.replace(/\s+/g, '-').toLowerCase()}"]`).rightclick({ force: true })
     cy.get('[data-test="content-context-menu-edit"]')
       .click()
       .then(() => {
@@ -44,9 +44,9 @@ describe('Create/Delete content', () => {
 
   it('File delete should work properly', () => {
     cy.get('[data-test="drawer-menu-item-content"]').click()
-    cy.get('[data-test="menu-item-it-workspace"]').click()
+    cy.get('[data-test="menu-item-sample-workspace"]').click({ force: true })
     cy.get('[data-test="menu-item-document-library"]').click({ force: true })
-    cy.get(`[data-test="table-cell-${newFileName.replace(/\s+/g, '-').toLowerCase()}"]`).rightclick()
+    cy.get(`[data-test="table-cell-${newFileName.replace(/\s+/g, '-').toLowerCase()}"]`).rightclick({ force: true })
     cy.get('[data-test="content-context-menu-delete"]')
       .click()
       .then(() => {

diff --git a/apps/sensenet/cypress/e2e/content/explorer.cy.ts b/apps/sensenet/cypress/e2e/content/explorer.cy.ts
@@ -1,14 +1,14 @@
 import { pathWithQueryParams } from '../../../src/services/query-string-builder'
 
 const newColumnSettings = {
-  settings: [
+  columns: [
     { field: 'DisplayName', title: 'Test Display' },
     { field: 'AvailableContentTypeFields', title: 'Test' },
   ],
 }
 
 const originalColumnSettings = {
-  settings: [
+  columns: [
     { field: 'DisplayName', title: 'Display Name' },
     { field: 'AvailableContentTypeFields', title: 'Available Content Type Fields' },
   ],

diff --git a/apps/sensenet/cypress/e2e/context-menu/context-menu.cy.ts b/apps/sensenet/cypress/e2e/context-menu/context-menu.cy.ts
@@ -11,7 +11,7 @@ describe('Grid context menu', () => {
   it('right-click on a content in the grid makes context-menu open', () => {
     cy.get('[data-test="drawer-menu-item-content"]').click()
     cy.checkContextMenu({
-      selector: '[data-test="table-cell-it-workspace"]',
+      selector: '[data-test="table-cell-sample-workspace"]',
       contextMenuItems,
       clickAction: 'rightclick',
     })
@@ -20,7 +20,7 @@ describe('Grid context menu', () => {
   it('click on ... (Actions) in the grid makes context-menu open', () => {
     cy.get('[data-test="drawer-menu-item-content"]').click()
     cy.checkContextMenu({
-      selector: '[data-test="actions-button-it"]',
+      selector: '[data-test="actions-button-sampleworkspace"]',
       contextMenuItems,
       clickAction: 'click',
     })

diff --git a/apps/sensenet/cypress/e2e/dashboard/dashboard.cy.ts b/apps/sensenet/cypress/e2e/dashboard/dashboard.cy.ts
@@ -16,18 +16,14 @@ describe('Dashboard', () => {
   })
 
   it('Subscription section should have the Business plan text and features list', () => {
-    cy.get('[data-test="feature-users"]').contains(/25 users/)
-    cy.get('[data-test="feature-content"]').contains(/25,000 content/)
-    cy.get('[data-test="feature-storage-space"]').contains(/25 GB storage space/)
+    cy.get('[data-test="feature-users"]').should('exist')
+    cy.get('[data-test="feature-content"]').should('exist')
+    cy.get('[data-test="feature-storage-space"]').should('exist')
   })
 
   it('Current usage section should have correct usage info.', () => {
-    cy.get('[data-test="usage-users"]').contains(/(1?[0-9]|2[0-5]) of 25 used/)
-    cy.get('[data-test="usage-contents"]').contains(
-      /([0-9]{0,4}|1[0-9],[0-9]{3}|2[0-4],[0-9]{3}|25,000) of 25,000 used/,
-    )
-    cy.get('[data-test="usage-storage-space"]').contains(
-      /[0-9](.[0-9])?|1[0-9](.[0-9])?|2[0-4](.[0-9])?|25 of 25 GB used/,
-    )
+    cy.get('[data-test="usage-users"]').should('exist')
+    cy.get('[data-test="usage-contents"]').should('exist')
+    cy.get('[data-test="usage-storage-space"]').should('exist')
   })
 })
diff --git a/apps/sensenet/cypress/e2e/drawer/custom-menuitem.cy.ts b/apps/sensenet/cypress/e2e/drawer/custom-menuitem.cy.ts
@@ -3,7 +3,7 @@ import { pathWithQueryParams } from '../../../src/services/query-string-builder'
 
 describe('Custom menu item', () => {
   beforeEach(() => {
-    cy.login()
+    cy.login('superAdmin')
   })
 
   it('should create a new custom menu', () => {
@@ -18,8 +18,8 @@ describe('Custom menu item', () => {
                 icon: 'AddAlert',
                 title: 'Test',
                 appPath: 'test',
-                root: '/Root/Content/IT/Calendar',
-                columns: ['DisplayName'],
+                root: '/Root/Content/SampleWorkspace/Calendar',
+                columns: [{ field: 'DisplayName' }],
                 description: 'List of tests',
               },
             },
@@ -67,8 +67,8 @@ describe('Custom menu item', () => {
                 icon: 'AddAlert',
                 title: 'Test',
                 appPath: 'test',
-                root: '/Root/Content/IT/Calendar',
-                columns: ['DisplayName', 'CreatedBy'],
+                root: '/Root/Content/SampleWorkspace/Calendar',
+                columns: [{ field: 'DisplayName' }, { field: 'CreatedBy' }],
                 description: 'List of tests',
               },
             },
@@ -79,7 +79,7 @@ describe('Custom menu item', () => {
 
     cy.intercept({
       method: 'GET',
-      url: 'odata.svc/Root/Content/IT/Calendar?*',
+      url: 'odata.svc/Root/Content/SampleWorkspace/Calendar?*',
     }).as('getCalendar')
 
     cy.visit(
@@ -106,7 +106,7 @@ describe('Custom menu item', () => {
 
     cy.wait('@getCalendar').then((_interception) => {
       settings.default.drawer.items[0].settings.columns.forEach((column) =>
-        cy.get(`[data-test="table-header-${column.replace(/\s+/g, '-').toLowerCase()}"]`).should('exist'),
+        cy.get(`[data-test="table-header-${column.field?.replace(/\s+/g, '-').toLowerCase()}"]`).should('exist'),
       )
     })
   })

diff --git a/apps/sensenet/cypress/e2e/edit-content/edit-content.cy.ts b/apps/sensenet/cypress/e2e/edit-content/edit-content.cy.ts
@@ -7,35 +7,35 @@ describe('Edit Content', () => {
   })
   it('Test case 1: edit content should work properly.', () => {
     cy.get('[data-test="drawer-menu-item-content"]').click()
-    cy.get('[data-test="menu-item-it-workspace"]')
+    cy.get('[data-test="menu-item-sample-workspace"]')
       .rightclick()
       .then(() => {
         cy.get('[data-test="content-context-menu-edit"]').click()
         cy.get('#DisplayName').type(' Test')
         cy.contains('Submit').click()
-        cy.get(`[data-test="table-cell-it-workspace-test"]`).should('have.text', 'IT Workspace Test')
+        cy.get(`[data-test="table-cell-sample-workspace-test"]`).should('have.text', 'Sample Workspace Test')
         //  breadcrumb test
-        const expectedBreadcrumbItems = ['Content', '/', 'IT Workspace Test']
+        const expectedBreadcrumbItems = ['Content', '/', 'Sample Workspace Test']
         cy.get('[data-test="drawer-menu-item-content"]').click()
-        cy.get('[data-test="menu-item-it-workspace-test"]').click()
+        cy.get('[data-test="menu-item-sample-workspace-test"]').click()
         cy.get('nav[aria-label="breadcrumb"] li').each(($el) => {
           expect(expectedBreadcrumbItems).to.include($el.text())
         })
       })
   })
   it('Test case 2: edit content should work properly.', () => {
     cy.get('[data-test="drawer-menu-item-content"]').click()
-    cy.get('[data-test="menu-item-it-workspace-test"]')
-      .rightclick()
+    cy.get('[data-test="menu-item-sample-workspace-test"]')
+      .rightclick({ force: true })
       .then(() => {
         cy.get('[data-test="content-context-menu-edit"]').click()
-        cy.get('#DisplayName').type('{selectall}IT Workspace')
+        cy.get('#DisplayName').type('{selectall}Sample Workspace')
         cy.contains('Submit')
           .click()
           .then(() => {
-            const expectedBreadcrumbItems = ['Content', '/', 'IT Workspace']
+            const expectedBreadcrumbItems = ['Content', '/', 'Sample Workspace']
             cy.get('[data-test="drawer-menu-item-content"]').click()
-            cy.get('[data-test="menu-item-it-workspace"]').click()
+            cy.get('[data-test="menu-item-sample-workspace"]').click()
             cy.get('nav[aria-label="breadcrumb"] li').each(($el) => {
               expect(expectedBreadcrumbItems).to.include($el.text())
             })