From 0a21c147ec317888eebc3b480a9bca72f734ebda Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Fri, 25 Aug 2023 13:53:48 +0200 Subject: [PATCH 01/67] batch 1 --- e2e/client/specs/archived_spec.ts | 3 ++- e2e/client/specs/content_spec.ts | 7 +++--- e2e/client/specs/helpers/authoring.ts | 24 +++++++------------ e2e/client/specs/helpers/constants.ts | 1 + e2e/client/specs/helpers/monitoring.ts | 12 ++++------ e2e/client/specs/legal_archive_spec.ts | 2 +- e2e/client/specs/monitoring_spec.ts | 6 +++-- e2e/client/specs/users_spec.ts | 16 ++++++------- .../content-create-dropdown.tsx | 1 + .../dropdown-option.tsx | 2 ++ .../content-create-dropdown/initial-view.tsx | 3 +++ .../more-templates.tsx | 1 + 12 files changed, 40 insertions(+), 38 deletions(-) create mode 100644 e2e/client/specs/helpers/constants.ts diff --git a/e2e/client/specs/archived_spec.ts b/e2e/client/specs/archived_spec.ts index 9fb56996eb..3df82ad8d5 100644 --- a/e2e/client/specs/archived_spec.ts +++ b/e2e/client/specs/archived_spec.ts @@ -3,6 +3,7 @@ import {globalSearch} from './helpers/search'; import {authoring} from './helpers/authoring'; import {content} from './helpers/content'; import {monitoring} from './helpers/monitoring'; +import {element, by} from 'protractor'; describe('archived', () => { beforeEach(() => { @@ -31,7 +32,7 @@ describe('archived', () => { expect(authoring.edit_correct_button.isDisplayed()).toBe(false); expect(authoring.edit_kill_button.isDisplayed()).toBe(false); expect(authoring.edit_takedown_button.isDisplayed()).toBe(false); - expect(authoring.navbarMenuBtn.isPresent()).toBe(false); + expect(element(by.css('[data-test-id="authoring-create]')).isPresent()).toBe(false); expect(authoring.sendToButton.isDisplayed()).toBe(false); authoring.showInfo(); expect(authoring.isPublishedState()).toBe(true); diff --git a/e2e/client/specs/content_spec.ts b/e2e/client/specs/content_spec.ts index 7b8a5d255f..402bf11b2f 100644 --- a/e2e/client/specs/content_spec.ts +++ b/e2e/client/specs/content_spec.ts @@ -150,8 +150,7 @@ describe('content', () => { workspace.switchToDesk('SPORTS DESK'); content.setListView(); - element(by.className('sd-create-btn')).click(); - element(by.id('create_text_article')).click(); + authoring.createTextItem(); authoring.writeText('Words'); authoring.save(); @@ -164,8 +163,8 @@ describe('content', () => { workspace.switchToDesk('SPORTS DESK'); content.setListView(); - element(by.className('sd-create-btn')).click(); - element(by.id('create_package')).click(); + el(['authoring-create']).click(); + el(['content-create-dropdown', 'create-package']).click(); element.all(by.model('item.headline')).first().sendKeys('Empty Package'); authoring.save(); diff --git a/e2e/client/specs/helpers/authoring.ts b/e2e/client/specs/helpers/authoring.ts index d87977be8f..845109c923 100644 --- a/e2e/client/specs/helpers/authoring.ts +++ b/e2e/client/specs/helpers/authoring.ts @@ -3,6 +3,7 @@ import {element, by, browser, protractor} from 'protractor'; import {waitHidden, waitFor, click} from './utils'; import {ECE, els, el} from '@superdesk/end-to-end-testing-helpers'; +import {PLAIN_TEXT_TEMPLATE_NAME} from './constants'; class Authoring { lock: any; @@ -20,8 +21,6 @@ class Authoring { edit_correct_button: any; edit_kill_button: any; edit_takedown_button: any; - navbarMenuBtn: any; - newPlainArticleLink: any; newEmptyPackageLink: any; infoIconsBox: any; sendToButton: any; @@ -180,6 +179,7 @@ class Authoring { openCompareVersionsInnerDropdown: (index: any) => void; getInnerDropdownItemVersions: (index: any) => any; openItemVersionInBoard: (board: any, index: any) => void; + createPlainTextArticle: () => void; constructor() { this.lock = element(by.css('[ng-click="lock()"]')); @@ -198,8 +198,6 @@ class Authoring { this.edit_kill_button = element(by.css('[title="Kill"]')); this.edit_takedown_button = element(by.css('[title="Takedown"]')); - this.navbarMenuBtn = element(by.css('.dropdown__toggle.sd-create-btn')); - this.newPlainArticleLink = element(by.id('create_text_article')); this.newEmptyPackageLink = element(by.id('create_package')); this.infoIconsBox = element(by.css('.info-icons')); @@ -345,10 +343,8 @@ class Authoring { return element(by.className('svg-icon-add-to-list')).click(); }; - this.createTextItem = function() { - return element(by.className('sd-create-btn')) - .click() - .then(() => element(by.id('create_text_article')).click()); + this.createTextItem = () => { + this.createTextItemFromTemplate(PLAIN_TEXT_TEMPLATE_NAME); }; /** @@ -357,13 +353,11 @@ class Authoring { * @param {String} name */ this.createTextItemFromTemplate = (name) => { - element(by.className('sd-create-btn')).click(); - element(by.id('more_templates')).click(); - let templates = element.all(by.repeater('template in templates track by template._id')); - - templates.all(by.css('[ng-click="select({template: template})"]')) - .filter((elem) => elem.getText().then((text) => text.toUpperCase().indexOf(name.toUpperCase()) > -1)) - .click(); + el(['authoring-create']).click(); + el(['content-create-dropdown'], by.buttonText('More templates...')).click(); + el(['content-create-dropdown', 'search']).sendKeys(name); + el(['content-create-dropdown'], by.buttonText(name)).click(); + browser.wait(ECE.presenceOf(el(['authoring']))); }; this.close = function() { diff --git a/e2e/client/specs/helpers/constants.ts b/e2e/client/specs/helpers/constants.ts new file mode 100644 index 0000000000..fd2eec0ef5 --- /dev/null +++ b/e2e/client/specs/helpers/constants.ts @@ -0,0 +1 @@ +export const PLAIN_TEXT_TEMPLATE_NAME = 'plain text'; diff --git a/e2e/client/specs/helpers/monitoring.ts b/e2e/client/specs/helpers/monitoring.ts index f20358ff7c..d32052bd1c 100644 --- a/e2e/client/specs/helpers/monitoring.ts +++ b/e2e/client/specs/helpers/monitoring.ts @@ -98,7 +98,6 @@ class Monitoring { openSendMenu: () => void; publish: () => void; getPublishButtonText: any; - startUpload: () => void; uploadModal: ElementFinder; openFetchAsOptions: (group: any, item: any) => void; clickOnFetchButton: any; @@ -177,7 +176,10 @@ class Monitoring { /** * Create new item using desk template */ - this.createFromDeskTemplate = () => this.createItemAction('create_text_article'); + this.createFromDeskTemplate = () => { + el(['authoring-create']).click(); + el(['content-create-dropdown', 'default-desk-template']).click(); + }; this.getGroup = function(group: number) { return this.getGroups().get(group); @@ -717,7 +719,7 @@ class Monitoring { }; this.openCreateMenu = function() { - element(by.className('sd-create-btn')).click(); + element(by.css('[data-test-id="authoring-create"]')).click(); browser.sleep(100); }; @@ -733,10 +735,6 @@ class Monitoring { this.getPublishButtonText = () => element(by.css('[ng-click="publish()"]')).getText(); - this.startUpload = function() { - element(by.id('start-upload-btn')).click(); - }; - this.uploadModal = element(by.className('upload-media')); this.openFetchAsOptions = function(group, item) { diff --git a/e2e/client/specs/legal_archive_spec.ts b/e2e/client/specs/legal_archive_spec.ts index fd0ae6f285..7c144030bb 100644 --- a/e2e/client/specs/legal_archive_spec.ts +++ b/e2e/client/specs/legal_archive_spec.ts @@ -79,7 +79,7 @@ describe('legal_archive', () => { expect(authoring.edit_button.isPresent()).toBe(false); expect(authoring.edit_correct_button.isPresent()).toBe(false); expect(authoring.edit_kill_button.isPresent()).toBe(false); - expect(authoring.navbarMenuBtn.isPresent()).toBe(false); + expect(element(by.css('[data-test-id="authoring-create]')).isPresent()).toBe(false); expect(authoring.sendToButton.isDisplayed()).toBe(false); authoring.showInfo(); diff --git a/e2e/client/specs/monitoring_spec.ts b/e2e/client/specs/monitoring_spec.ts index 450c97e7ea..2563e20d7c 100644 --- a/e2e/client/specs/monitoring_spec.ts +++ b/e2e/client/specs/monitoring_spec.ts @@ -473,8 +473,10 @@ describe('monitoring', () => { it('can start content upload', () => { monitoring.openMonitoring(); - monitoring.openCreateMenu(); - monitoring.startUpload(); + + el(['authoring-create']).click(); + el(['content-create-dropdown', 'upload-media']).click(); + expect(monitoring.uploadModal.isDisplayed()).toBeTruthy(); }); diff --git a/e2e/client/specs/users_spec.ts b/e2e/client/specs/users_spec.ts index dfc2d5cc80..689f95d665 100644 --- a/e2e/client/specs/users_spec.ts +++ b/e2e/client/specs/users_spec.ts @@ -246,8 +246,9 @@ describe('users', () => { // navigate to Workspace and create a new article workspace.openContent(); - authoring.navbarMenuBtn.click(); - authoring.newPlainArticleLink.click(); + + + authoring.createTextItem(); // authoring opened, click the set category menu and see what // categories are offered @@ -275,8 +276,7 @@ describe('users', () => { // navigate to Workspace and create a new article monitoring.openMonitoring(); - authoring.navbarMenuBtn.click(); - authoring.newPlainArticleLink.click(); + authoring.createTextItem(); browser.sleep(100); // Open subject metadata dropdown field @@ -354,19 +354,19 @@ describe('users', () => { }); it('while creating a new user', () => { - var buttonCreate = element(by.className('sd-create-btn')); + var buttonCreate = element(by.css('[data-test-id="create-user-button"]')); buttonCreate.click(); - expect(element(by.id('user_default_desk')).isPresent()).toBe(false); + expect(element(by.css('[data-test-id="default-desk-template"]')).isPresent()).toBe(false); }); it('while pre-viewing and user clicks on create new user', () => { - var buttonCreate = element(by.className('sd-create-btn')); + var buttonCreate = element(by.css('[data-test-id="create-user-button"]')); element.all(by.repeater('users')).first().click(); buttonCreate.click(); - expect(element(by.id('user_default_desk')).isPresent()).toBe(false); + expect(element(by.css('[data-test-id="default-desk-template"]')).isPresent()).toBe(false); }); }); diff --git a/scripts/core/ui/components/content-create-dropdown/content-create-dropdown.tsx b/scripts/core/ui/components/content-create-dropdown/content-create-dropdown.tsx index e40b6cff2e..a3d4607d14 100644 --- a/scripts/core/ui/components/content-create-dropdown/content-create-dropdown.tsx +++ b/scripts/core/ui/components/content-create-dropdown/content-create-dropdown.tsx @@ -18,6 +18,7 @@ const defaultButton = ({onClick}: IPropsAddContentCustomButton) => ( shape="round" iconOnly={true} onClick={onClick} + data-test-id="authoring-create" /> ); diff --git a/scripts/core/ui/components/content-create-dropdown/dropdown-option.tsx b/scripts/core/ui/components/content-create-dropdown/dropdown-option.tsx index 66dc63fd9f..9759af342c 100644 --- a/scripts/core/ui/components/content-create-dropdown/dropdown-option.tsx +++ b/scripts/core/ui/components/content-create-dropdown/dropdown-option.tsx @@ -7,6 +7,7 @@ interface IProps { icon?: {name: string, color?: string}; privateTag?: boolean; onClick: (event: React.MouseEvent) => void; + 'data-test-id'?: string; } export class DropdownOption extends React.PureComponent { @@ -17,6 +18,7 @@ export class DropdownOption extends React.PureComponent { - @@ -173,9 +179,11 @@

-
    @@ -325,7 +333,7 @@

- + From 0b679c5ec6e0e0243aff41ca2b1291715b60aac2 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Fri, 8 Sep 2023 12:32:08 +0200 Subject: [PATCH 18/67] fix e2e test creates corresponding template --- e2e/client/specs/content_profile_spec.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/e2e/client/specs/content_profile_spec.ts b/e2e/client/specs/content_profile_spec.ts index e99710e163..b06eb85941 100644 --- a/e2e/client/specs/content_profile_spec.ts +++ b/e2e/client/specs/content_profile_spec.ts @@ -19,7 +19,6 @@ describe('Content profiles', () => { templates.openTemplatesSettings(); expect(templates.getListCount()).toBeGreaterThan(2); templates.edit('Simple'); - expect(authoring.getAbstractFieldCount()).toEqual(0); expect(templates.getContentProfile()).toEqual('Simple'); templates.cancel(); From 974bf3e311be7608381e47c911e9b0f64732f5a7 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Fri, 8 Sep 2023 12:37:35 +0200 Subject: [PATCH 19/67] fix test displays defined fields in authoring --- e2e/client/specs/content_profile_spec.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/e2e/client/specs/content_profile_spec.ts b/e2e/client/specs/content_profile_spec.ts index b06eb85941..10fe77122c 100644 --- a/e2e/client/specs/content_profile_spec.ts +++ b/e2e/client/specs/content_profile_spec.ts @@ -56,7 +56,6 @@ describe('Content profiles', () => { monitoring.openMonitoring(); workspace.selectDesk('Sports Desk'); authoring.createTextItemFromTemplate('simple'); - expect(authoring.getAbstractFieldCount()).toEqual(0); // publish of the required field will fail authoring.setHeaderSluglineText('Story1 slugline'); From 4a0b8efd8d552fd1508e5b3a888e89eda420212e Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Fri, 8 Sep 2023 12:46:07 +0200 Subject: [PATCH 20/67] fix e2e test can select multiple items --- e2e/client/specs/content_spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e/client/specs/content_spec.ts b/e2e/client/specs/content_spec.ts index d8bcd4cbbf..e68dfc53ba 100644 --- a/e2e/client/specs/content_spec.ts +++ b/e2e/client/specs/content_spec.ts @@ -141,7 +141,7 @@ describe('content', () => { browser.sleep(100); - multiAction('Multiedit'); + multiAction('Multi-edit'); expect(browser.getCurrentUrl()).toMatch(/multiedit$/); expect(element.all(by.repeater('board in boards')).count()).toBe(2); }); From 6818fdaeec7ec436183c385b72d878ce947f9f6a Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Sun, 10 Sep 2023 19:16:31 +0200 Subject: [PATCH 21/67] display error if sending to desk fails fixes e2e test - can enforce incoming, outgoing and onstage rules --- e2e/client/specs/helpers/utils.ts | 7 ------- scripts/api/article-send.tsx | 4 ++++ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/e2e/client/specs/helpers/utils.ts b/e2e/client/specs/helpers/utils.ts index e24adcebe7..f3725748c0 100644 --- a/e2e/client/specs/helpers/utils.ts +++ b/e2e/client/specs/helpers/utils.ts @@ -179,13 +179,6 @@ export function altKey(key) { export function assertToastMsg(type: 'info' | 'success' | 'error', msg: string) { const elem = element(s([`notification--${type}`], msg)); - click(elem); - - /** - * It seems there's an issue with protractor: - * Clicking an element throws `StaleElementReferenceError` when clicked immediately - * after waiting until it's clickable. - */ elem.isPresent().then((present) => { // Only click if the toast is still present. if (present) { diff --git a/scripts/api/article-send.tsx b/scripts/api/article-send.tsx index 89e9dc869f..965843e60b 100644 --- a/scripts/api/article-send.tsx +++ b/scripts/api/article-send.tsx @@ -244,6 +244,10 @@ export function sendItems( delete patchFinal['_links']; return patchFinal; + }).catch((err) => { + notify.error(err._message ?? gettext('Unknown error occurred')); + + throw err; }); }); }), From 37982ac4ef464b03b17a66be16c99a7fe79e0b15 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Sun, 10 Sep 2023 19:21:29 +0200 Subject: [PATCH 22/67] fix e2e test can fetch as --- e2e/client/specs/fetch_spec.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/e2e/client/specs/fetch_spec.ts b/e2e/client/specs/fetch_spec.ts index 7c909be33f..6931c17a77 100644 --- a/e2e/client/specs/fetch_spec.ts +++ b/e2e/client/specs/fetch_spec.ts @@ -5,7 +5,7 @@ import {content} from './helpers/content'; import {authoring} from './helpers/authoring'; import {desks} from './helpers/desks'; import {multiAction} from './helpers/actions'; -import {ECE, els} from '@superdesk/end-to-end-testing-helpers'; +import {ECE, el, els} from '@superdesk/end-to-end-testing-helpers'; describe('fetch', () => { beforeEach(() => { @@ -31,7 +31,7 @@ describe('fetch', () => { it('can fetch as', () => { workspace.openIngest(); content.actionOnItem('Fetch To', 0); - content.send(); + el(['interactive-actions-panel', 'fetch']).click(); workspace.openContent(); expect(content.count()).toBe(3); }); From a166094599bd79a29626b6f6e2f1da027e8a60b3 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Mon, 11 Sep 2023 18:13:23 +0200 Subject: [PATCH 23/67] fix e2e test can not Fetch-and-Open if selected desk as a non-member --- e2e/client/specs/fetch_spec.ts | 21 ++++++++++++---- e2e/client/specs/helpers/authoring.ts | 7 ++---- scripts/api/desks.ts | 6 +++++ .../actions/fetch-to-tab.tsx | 25 ++++++++++++++++++- scripts/core/superdesk-api.d.ts | 4 +-- 5 files changed, 50 insertions(+), 13 deletions(-) diff --git a/e2e/client/specs/fetch_spec.ts b/e2e/client/specs/fetch_spec.ts index 6931c17a77..db3697c226 100644 --- a/e2e/client/specs/fetch_spec.ts +++ b/e2e/client/specs/fetch_spec.ts @@ -5,7 +5,7 @@ import {content} from './helpers/content'; import {authoring} from './helpers/authoring'; import {desks} from './helpers/desks'; import {multiAction} from './helpers/actions'; -import {ECE, el, els} from '@superdesk/end-to-end-testing-helpers'; +import {ECE, el, els, s} from '@superdesk/end-to-end-testing-helpers'; describe('fetch', () => { beforeEach(() => { @@ -46,9 +46,9 @@ describe('fetch', () => { workspace.openIngest(); content.actionOnItem('Fetch To', 0); - var btnFetchAndOpen = element(by.css('[ng-disabled="disableFetchAndOpenButton()"]')); + var btnFetchAndOpen = element(s(['interactive-actions-panel', 'fetch-and-open'])); - expect(btnFetchAndOpen.getAttribute('disabled')).toBeFalsy(); + expect(btnFetchAndOpen.isEnabled()).toBe(true); // Adding a new desk with no member, which serves as a non-member desk when selected desks.openDesksSettings(); @@ -59,12 +59,23 @@ describe('fetch', () => { desks.setDeskType('authoring'); desks.setDeskDefaultContentTemplate('testing'); desks.setDeskDefaultContentProfile('testing'); - desks.actionDoneOnGeneralTab(); + desks.actionSaveAndContinueOnGeneralTab(); // save desk and continue to Stages tab + + desks.editStage('Working Stage'); + desks.toggleGlobalReadFlag(); // turn OFF Global Read + desks.saveEditedStage(); + + desks.editStage('Incoming Stage'); + desks.toggleGlobalReadFlag(); // turn OFF Global Read + desks.saveEditedStage(); + + desks.actionDoneOnStagesTab(); workspace.openIngest(); content.actionOnItem('Fetch To', 0); authoring.selectDeskforSendTo('Test Desk'); - expect(btnFetchAndOpen.getAttribute('disabled')).toBeTruthy(); + + expect(btnFetchAndOpen.isEnabled()).toBe(false); }); it('can hide stage with global read OFF if selected desk as a non-member', () => { diff --git a/e2e/client/specs/helpers/authoring.ts b/e2e/client/specs/helpers/authoring.ts index a9c4b5869f..e891cc4754 100644 --- a/e2e/client/specs/helpers/authoring.ts +++ b/e2e/client/specs/helpers/authoring.ts @@ -321,12 +321,9 @@ class Authoring { }; this.selectDeskforSendTo = function(desk) { - var sidebar = element.all(by.css('.side-panel')).last(), - dropdown = element(by.css('.dropdown--boxed .dropdown__toggle')); + el(['interactive-actions-panel', 'destination-select']).click(); - dropdown.waitReady(); - dropdown.click(); - sidebar.element(by.buttonText(desk)).click(); + element(by.cssContainingText('[data-test-id="interactive-actions-panel"] option', desk)).click(); }; this.markAction = function() { diff --git a/scripts/api/desks.ts b/scripts/api/desks.ts index e6c52e95c9..36f516a7d5 100644 --- a/scripts/api/desks.ts +++ b/scripts/api/desks.ts @@ -31,6 +31,10 @@ function getAllDesks(): OrderedMap { return desksMap; } +function getCurrentUserDesks(): Array { + return ng.get('desks').userDesks; +} + function getDeskStages(deskId: IDesk['_id']): OrderedMap { let stagesMap: OrderedMap = OrderedMap(); @@ -53,6 +57,7 @@ interface IDesksApi { getAllDesks(): OrderedMap; getDeskById(id: IDesk['_id']): IDesk ; getDeskStages(deskId: IDesk['_id']): OrderedMap; + getCurrentUserDesks(): Array; // desks that current user has access to } export const desks: IDesksApi = { @@ -62,4 +67,5 @@ export const desks: IDesksApi = { getAllDesks, getDeskById, getDeskStages, + getCurrentUserDesks, }; diff --git a/scripts/core/interactive-article-actions-panel/actions/fetch-to-tab.tsx b/scripts/core/interactive-article-actions-panel/actions/fetch-to-tab.tsx index 934d4af16d..b2ff2453c0 100644 --- a/scripts/core/interactive-article-actions-panel/actions/fetch-to-tab.tsx +++ b/scripts/core/interactive-article-actions-panel/actions/fetch-to-tab.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import {IArticle, IDesk, OrderedMap} from 'superdesk-api'; +import {IArticle} from 'superdesk-api'; import {Button, ButtonGroup, ToggleBox} from 'superdesk-ui-framework/react'; import {gettext} from 'core/utils'; import {PanelContent} from '../panel/panel-content'; @@ -10,6 +10,7 @@ import {DestinationSelect} from '../subcomponents/destination-select'; import {ISendToDestination} from '../interfaces'; import {sdApi} from 'api'; import {noop} from 'lodash'; +import {assertNever} from 'core/helpers/typescript-helpers'; interface IProps { items: Array; @@ -50,6 +51,26 @@ export class FetchToTab extends React.PureComponent { render() { const {markupV2} = this.props; + const canFetch: boolean = (() => { + if (this.state.selectedDestination.type === 'personal-space') { + throw new Error('fetching to personal space is not supported'); + } else if (this.state.selectedDestination.type === 'desk') { + const destinationStage = sdApi.desks.getDeskStages( + this.state.selectedDestination.desk, + ).get(this.state.selectedDestination.stage); + + if (destinationStage.is_visible) { + return true; + } else { + return sdApi.desks.getCurrentUserDesks() + .map(({_id}) => _id) + .includes(this.state.selectedDestination.desk); + } + } else { + return assertNever(this.state.selectedDestination); + } + })(); + return ( @@ -80,6 +101,7 @@ export class FetchToTab extends React.PureComponent { style="hollow" expand data-test-id="fetch-and-open" + disabled={!canFetch} /> ) } @@ -93,6 +115,7 @@ export class FetchToTab extends React.PureComponent { type="primary" expand data-test-id="fetch" + disabled={!canFetch} /> diff --git a/scripts/core/superdesk-api.d.ts b/scripts/core/superdesk-api.d.ts index f2efa1f353..6b122b6aa3 100644 --- a/scripts/core/superdesk-api.d.ts +++ b/scripts/core/superdesk-api.d.ts @@ -1348,8 +1348,8 @@ declare module 'superdesk-api' { desk_order: number; desk: IDesk['_id']; content_expiry: number; - is_visible: boolean; - local_readonly: boolean; + is_visible: boolean; // public - other users can see content or send articles to that stage + local_readonly: boolean; // content is readonly - even for stage owners incoming_macro: string; outgoing_macro: string; onstage_macro: string; From 2f4c996c54d2e785ec563610b5188f9fc0a31c5e Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Mon, 11 Sep 2023 19:10:35 +0200 Subject: [PATCH 24/67] fix e2e test can hide stage with global read OFF if selected desk as a non-member --- e2e/client/specs/fetch_spec.ts | 15 +++++++------ .../subcomponents/destination-select.tsx | 22 ++++++++++++++----- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/e2e/client/specs/fetch_spec.ts b/e2e/client/specs/fetch_spec.ts index db3697c226..81261f82c2 100644 --- a/e2e/client/specs/fetch_spec.ts +++ b/e2e/client/specs/fetch_spec.ts @@ -82,9 +82,9 @@ describe('fetch', () => { workspace.openIngest(); content.actionOnItem('Fetch To', 0); - var btnFetchAndOpen = element(by.css('[ng-disabled="disableFetchAndOpenButton()"]')); + var btnFetchAndOpen = element(s(['interactive-actions-panel', 'fetch-and-open'])); - expect(btnFetchAndOpen.getAttribute('disabled')).toBeFalsy(); + expect(btnFetchAndOpen.isEnabled()).toBe(true); // Adding a new desk with no member, which serves as a non-member desk when selected desks.openDesksSettings(); @@ -117,11 +117,12 @@ describe('fetch', () => { content.actionOnItem('Fetch To', 0); authoring.selectDeskforSendTo('Test Desk'); - var sidebar = element.all(by.css('.side-panel')).last(); - - expect(sidebar.element(by.buttonText('Working Stage')).isPresent()).toBeTruthy(); - expect(sidebar.element(by.buttonText('Test Stage')).isPresent()).toBeFalsy(); - expect(btnFetchAndOpen.getAttribute('disabled')).toBeTruthy(); + expect( + element(s(['interactive-actions-panel', 'stage-select', 'item'], 'Working Stage')).isPresent(), + ).toBeTruthy(); + expect( + element(s(['interactive-actions-panel', 'stage-select', 'item'], 'Test Stage')).isPresent(), + ).toBeFalsy(); }); it('can fetch multiple items', () => { diff --git a/scripts/core/interactive-article-actions-panel/subcomponents/destination-select.tsx b/scripts/core/interactive-article-actions-panel/subcomponents/destination-select.tsx index 4015ee1965..f092a61b48 100644 --- a/scripts/core/interactive-article-actions-panel/subcomponents/destination-select.tsx +++ b/scripts/core/interactive-article-actions-panel/subcomponents/destination-select.tsx @@ -36,6 +36,8 @@ export class DestinationSelect extends React.PureComponent { destinations.push(destinationPersonalSpace); } + const userDesksIds: Set = new Set(sdApi.desks.getCurrentUserDesks().map(({_id}) => _id)); + return (
@@ -97,12 +99,20 @@ export class DestinationSelect extends React.PureComponent { orientation: 'horizontal', }} options={ - sdApi.desks.getDeskStages(selectedDestination.desk).toArray().map((stage) => ({ - label: stage.name, - value: stage._id, - icon: 'ok', - disabled: (this.props.disallowedStages ?? []).includes(stage._id), - })) + sdApi.desks.getDeskStages(selectedDestination.desk).toArray() + .filter((stage) => { + if (stage.is_visible === true) { + return true; + } else { + return userDesksIds.has(selectedDestination.desk); + } + }) + .map((stage) => ({ + label: stage.name, + value: stage._id, + icon: 'ok', + disabled: (this.props.disallowedStages ?? []).includes(stage._id), + })) } data-test-id="stage-select" /> From 5ac06dea9538f7c9156de0081321c80578da5fb9 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Mon, 11 Sep 2023 19:18:09 +0200 Subject: [PATCH 25/67] fix e2e test can fetch as multiple items --- e2e/client/specs/fetch_spec.ts | 2 +- scripts/apps/search/controllers/get-bulk-actions.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/e2e/client/specs/fetch_spec.ts b/e2e/client/specs/fetch_spec.ts index 81261f82c2..8d0650f671 100644 --- a/e2e/client/specs/fetch_spec.ts +++ b/e2e/client/specs/fetch_spec.ts @@ -139,7 +139,7 @@ describe('fetch', () => { content.selectItem(0); browser.sleep(1000); // Wait for animation multiAction('Fetch to'); - content.send(); + el(['interactive-actions-panel', 'fetch']).click(); workspace.openContent(); expect(content.count()).toBe(3); }); diff --git a/scripts/apps/search/controllers/get-bulk-actions.tsx b/scripts/apps/search/controllers/get-bulk-actions.tsx index 1950d5b640..4b65b18775 100644 --- a/scripts/apps/search/controllers/get-bulk-actions.tsx +++ b/scripts/apps/search/controllers/get-bulk-actions.tsx @@ -48,7 +48,7 @@ export function getBulkActions( label: gettext('Fetch to'), icon: 'icon-fetch-as', onTrigger: () => { - multiActions.sendTo(); + multiActions.fetch(true); scopeApply?.(); }, canAutocloseMultiActionBar: false, From fd333aae6c5f6a09377c80e10bf8dfdfe8c6efb1 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Mon, 11 Sep 2023 19:35:11 +0200 Subject: [PATCH 26/67] superdesk-ui-framework@3.0.57 --- package-lock.json | 100 +++++++++++++++++++++++----------------------- package.json | 2 +- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0c83ed4f87..ac468fff7b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -82,7 +82,7 @@ }, "@material-ui/lab": { "version": "4.0.0-alpha.61", - "resolved": "https://verdaccio.sourcefabric.org/@material-ui/lab/-/lab-4.0.0-alpha.61.tgz", + "resolved": "https://registry.npmjs.org/@material-ui/lab/-/lab-4.0.0-alpha.61.tgz", "integrity": "sha512-rSzm+XKiNUjKegj8bzt5+pygZeckNLOr+IjykH8sYdVk7dE9y2ZuUSofiMV2bJk3qU+JHwexmw+q0RyNZB9ugg==", "requires": { "@babel/runtime": "^7.4.4", @@ -111,7 +111,7 @@ }, "@material-ui/utils": { "version": "4.11.3", - "resolved": "https://verdaccio.sourcefabric.org/@material-ui/utils/-/utils-4.11.3.tgz", + "resolved": "https://registry.npmjs.org/@material-ui/utils/-/utils-4.11.3.tgz", "integrity": "sha512-ZuQPV4rBK/V1j2dIkSSEcH5uT6AaHuKWFfotADHsC0wVL1NLd2WkFCm4ZZbX33iO4ydl6V0GPngKm8HZQ2oujg==", "requires": { "@babel/runtime": "^7.4.4", @@ -576,7 +576,7 @@ }, "@superdesk/primereact": { "version": "5.0.2-12", - "resolved": "https://verdaccio.sourcefabric.org/@superdesk/primereact/-/primereact-5.0.2-12.tgz", + "resolved": "https://registry.npmjs.org/@superdesk/primereact/-/primereact-5.0.2-12.tgz", "integrity": "sha512-cyaek+NgIDg5AXxn29BwHprnHZB+pe3Ll2w2KlP2rmICm3cgbdVtjYJTT5d9Yxfioor6vVulo3O9BOxEmxpgnw==", "requires": { "react-transition-group": "^4.4.1" @@ -626,7 +626,7 @@ }, "@superdesk/react-resizable-panels": { "version": "0.0.39", - "resolved": "https://verdaccio.sourcefabric.org/@superdesk/react-resizable-panels/-/react-resizable-panels-0.0.39.tgz", + "resolved": "https://registry.npmjs.org/@superdesk/react-resizable-panels/-/react-resizable-panels-0.0.39.tgz", "integrity": "sha512-/aoKBYqNzzMACY82y7znr9v1jM63hvi0fglKU6IHWMvEpwQllsk/QHGzDNQb2lj8BOILfey4CRhRrDVXE3Rxmg==", "requires": { "@swc/helpers": "0.4.14" @@ -634,7 +634,7 @@ }, "@swc/helpers": { "version": "0.4.14", - "resolved": "https://verdaccio.sourcefabric.org/@swc/helpers/-/helpers-0.4.14.tgz", + "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.4.14.tgz", "integrity": "sha512-4C7nX/dvpzB7za4Ql9K81xK3HPxCpHMgwTZVyf+9JQ6VUbn9jjZVN7/Nkdz/Ugzs2CSjqnL/UPXroiVBVHUWUw==", "requires": { "tslib": "^2.4.0" @@ -696,7 +696,7 @@ }, "@types/enzyme-adapter-react-16": { "version": "1.0.6", - "resolved": "https://verdaccio.sourcefabric.org/@types/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.0.6.tgz", + "resolved": "https://registry.npmjs.org/@types/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.0.6.tgz", "integrity": "sha512-VonDkZ15jzqDWL8mPFIQnnLtjwebuL9YnDkqeCDYnB4IVgwUm0mwKkqhrxLL6mb05xm7qqa3IE95m8CZE9imCg==", "requires": { "@types/enzyme": "*" @@ -776,7 +776,7 @@ }, "@typescript-eslint/parser": { "version": "5.57.0", - "resolved": "https://verdaccio.sourcefabric.org/@typescript-eslint/parser/-/parser-5.57.0.tgz", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.57.0.tgz", "integrity": "sha512-orrduvpWYkgLCyAdNtR1QIWovcNZlEm6yL8nwH/eTxWLd8gsP+25pdLHYzL2QdkqrieaDwLpytHqycncv0woUQ==", "requires": { "@typescript-eslint/scope-manager": "5.57.0", @@ -787,7 +787,7 @@ "dependencies": { "debug": { "version": "4.3.4", - "resolved": "https://verdaccio.sourcefabric.org/debug/-/debug-4.3.4.tgz", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "requires": { "ms": "2.1.2" @@ -1000,7 +1000,7 @@ "object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==" + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" }, "prop-types": { "version": "15.8.1", @@ -2065,7 +2065,7 @@ }, "bindings": { "version": "1.5.0", - "resolved": "https://verdaccio.sourcefabric.org/bindings/-/bindings-1.5.0.tgz", + "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", "optional": true, "requires": { @@ -2632,7 +2632,7 @@ "strip-ansi": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz", - "integrity": "sha512-DerhZL7j6i6/nEnVG0qViKXI0OKouvvpsAiaj7c+LfqZZZxdwZtv8+UiA/w4VUJpT8UzX0pR1dcHOii1GbmruQ==", + "integrity": "sha1-JfSOoiynkYfzF0pNuHWTR7sSYiA=", "requires": { "ansi-regex": "^0.2.1" } @@ -2640,7 +2640,7 @@ "supports-color": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz", - "integrity": "sha512-tdCZ28MnM7k7cJDJc7Eq80A9CsRFAAOZUy41npOZCs++qSjfIy7o5Rh46CBk+Dk5FbKJ33X3Tqg4YrV07N5RaA==" + "integrity": "sha1-2S3iaU6z9nMjlz1649i1W0wiGQo=" } } }, @@ -2676,7 +2676,7 @@ }, "chart.js": { "version": "2.9.4", - "resolved": "https://verdaccio.sourcefabric.org/chart.js/-/chart.js-2.9.4.tgz", + "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-2.9.4.tgz", "integrity": "sha512-B07aAzxcrikjAPyV+01j7BmOpxtQETxTSlQ26BEYJ+3iUkbNKaOJ/nDbT6JjyqYxseM0ON12COHYdU2cTIjC7A==", "requires": { "chartjs-color": "^2.1.0", @@ -2685,7 +2685,7 @@ }, "chartjs-color": { "version": "2.4.1", - "resolved": "https://verdaccio.sourcefabric.org/chartjs-color/-/chartjs-color-2.4.1.tgz", + "resolved": "https://registry.npmjs.org/chartjs-color/-/chartjs-color-2.4.1.tgz", "integrity": "sha512-haqOg1+Yebys/Ts/9bLo/BqUcONQOdr/hoEr2LLTRl6C5LXctUdHxsCYfvQVg5JIxITrfCNUDr4ntqmQk9+/0w==", "requires": { "chartjs-color-string": "^0.6.0", @@ -2694,7 +2694,7 @@ }, "chartjs-color-string": { "version": "0.6.0", - "resolved": "https://verdaccio.sourcefabric.org/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz", + "resolved": "https://registry.npmjs.org/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz", "integrity": "sha512-TIB5OKn1hPJvO7JcteW4WY/63v6KwEdt6udfnDE9iCAZgy+V4SrbSxoIbTw/xkUIapjEI4ExGtD0+6D3KyFd7A==", "requires": { "color-name": "^1.0.0" @@ -3036,7 +3036,7 @@ }, "clsx": { "version": "1.2.1", - "resolved": "https://verdaccio.sourcefabric.org/clsx/-/clsx-1.2.1.tgz", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz", "integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==" }, "co": { @@ -3548,7 +3548,7 @@ }, "css-box-model": { "version": "1.2.1", - "resolved": "https://verdaccio.sourcefabric.org/css-box-model/-/css-box-model-1.2.1.tgz", + "resolved": "https://registry.npmjs.org/css-box-model/-/css-box-model-1.2.1.tgz", "integrity": "sha512-a7Vr4Q/kd/aw96bnJG332W9V9LkJO69JRcaCYDUqjp6/z0w6VcZjgAcTbgFxEPfBgdnAwlh3iwu+hLopa+flJw==", "requires": { "tiny-invariant": "^1.0.6" @@ -3734,7 +3734,7 @@ }, "date-fns": { "version": "2.7.0", - "resolved": "https://verdaccio.sourcefabric.org/date-fns/-/date-fns-2.7.0.tgz", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.7.0.tgz", "integrity": "sha512-wxYp2PGoUDN5ZEACc61aOtYFvSsJUylIvCjpjDOqM1UDaKIIuMJ9fAnMYFHV3TQaDpfTVxhwNK/GiCaHKuemTA==" }, "date-format": { @@ -4215,7 +4215,7 @@ "object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==" + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" } } }, @@ -4805,7 +4805,7 @@ }, "semver": { "version": "5.7.1", - "resolved": "https://verdaccio.sourcefabric.org/semver/-/semver-5.7.1.tgz", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" }, "string.prototype.trimend": { @@ -5019,7 +5019,7 @@ }, "semver": { "version": "5.7.1", - "resolved": "https://verdaccio.sourcefabric.org/semver/-/semver-5.7.1.tgz", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" }, "string.prototype.trimend": { @@ -6432,7 +6432,7 @@ "object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==" + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" } } }, @@ -9608,7 +9608,7 @@ "jsesc": { "version": "0.5.0", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", - "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=" + "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==" }, "json-loader": { "version": "0.5.7", @@ -11183,7 +11183,7 @@ }, "memoize-one": { "version": "5.2.1", - "resolved": "https://verdaccio.sourcefabric.org/memoize-one/-/memoize-one-5.2.1.tgz", + "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.2.1.tgz", "integrity": "sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q==" }, "memory-fs": { @@ -11580,7 +11580,7 @@ "dependencies": { "commander": { "version": "2.20.3", - "resolved": "https://verdaccio.sourcefabric.org/commander/-/commander-2.20.3.tgz", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" } } @@ -12095,7 +12095,7 @@ "object-assign": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz", - "integrity": "sha512-jHP15vXVGeVh1HuaA2wY6lxk+whK/x4KBG88VXeRma7CCun7iGD5qPc4eYykQ9sdQvg8jkwFKsSxHln2ybW3xQ==" + "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=" }, "object-component": { "version": "0.0.3", @@ -12921,7 +12921,7 @@ }, "popper.js": { "version": "1.14.4", - "resolved": "https://verdaccio.sourcefabric.org/popper.js/-/popper.js-1.14.4.tgz", + "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.14.4.tgz", "integrity": "sha512-VKAPR2KCx8Uw0oVn0Rt4iggzat+MJ1wu1uJiDnfnMiQcGQRBIopZLfXMKsK/K8NPEerY5kefaYtYjTLb3F6ncw==" }, "portfinder": { @@ -13547,7 +13547,7 @@ }, "primeicons": { "version": "2.0.0", - "resolved": "https://verdaccio.sourcefabric.org/primeicons/-/primeicons-2.0.0.tgz", + "resolved": "https://registry.npmjs.org/primeicons/-/primeicons-2.0.0.tgz", "integrity": "sha512-GJTCeMSQU8UU1GqbsaDrg/IH+b/vSinJQl52NVpdJ7sShYLZA8Eq6jLF48Ye3N/dQloGrE07i7XsZvxQ9pNbqg==" }, "private": { @@ -13620,7 +13620,7 @@ "object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==" } } }, @@ -13811,7 +13811,7 @@ }, "raf-schd": { "version": "4.0.3", - "resolved": "https://verdaccio.sourcefabric.org/raf-schd/-/raf-schd-4.0.3.tgz", + "resolved": "https://registry.npmjs.org/raf-schd/-/raf-schd-4.0.3.tgz", "integrity": "sha512-tQkJl2GRWh83ui2DiPTJz9wEiMN20syf+5oKfB03yYP7ioZcJwsIK8FjrtLwH1m7C7e+Tt2yYBlrOpdT+dyeIQ==" }, "railroad-diagrams": { @@ -13948,7 +13948,7 @@ }, "react-beautiful-dnd": { "version": "13.1.1", - "resolved": "https://verdaccio.sourcefabric.org/react-beautiful-dnd/-/react-beautiful-dnd-13.1.1.tgz", + "resolved": "https://registry.npmjs.org/react-beautiful-dnd/-/react-beautiful-dnd-13.1.1.tgz", "integrity": "sha512-0Lvs4tq2VcrEjEgDXHjT98r+63drkKEgqyxdA7qD3mvKwga6a5SscbdLPO2IExotU1jW8L0Ksdl0Cj2AF67nPQ==", "requires": { "@babel/runtime": "^7.9.2", @@ -14018,12 +14018,12 @@ }, "react-fast-compare": { "version": "3.2.2", - "resolved": "https://verdaccio.sourcefabric.org/react-fast-compare/-/react-fast-compare-3.2.2.tgz", + "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.2.tgz", "integrity": "sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ==" }, "react-id-generator": { "version": "3.0.2", - "resolved": "https://verdaccio.sourcefabric.org/react-id-generator/-/react-id-generator-3.0.2.tgz", + "resolved": "https://registry.npmjs.org/react-id-generator/-/react-id-generator-3.0.2.tgz", "integrity": "sha512-d0rqWzZ6g0P9agHtA7wX/ErQ4iV/657/0Oz+SX3kid7nR4d0YwaWjjOTIrgYHv2lICZKrxIH4BaKppKrM8fRfw==" }, "react-is": { @@ -14075,7 +14075,7 @@ }, "react-popper": { "version": "2.3.0", - "resolved": "https://verdaccio.sourcefabric.org/react-popper/-/react-popper-2.3.0.tgz", + "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-2.3.0.tgz", "integrity": "sha512-e1hj8lL3uM+sgSR4Lxzn5h1GxBlpa4CQz0XLF8kx4MDrDRWY0Ena4c97PUeSX9i5W3UAfDP0z0FXCTQkoXUl3Q==", "requires": { "react-fast-compare": "^3.0.1", @@ -14139,7 +14139,7 @@ }, "react-scrollspy": { "version": "3.4.3", - "resolved": "https://verdaccio.sourcefabric.org/react-scrollspy/-/react-scrollspy-3.4.3.tgz", + "resolved": "https://registry.npmjs.org/react-scrollspy/-/react-scrollspy-3.4.3.tgz", "integrity": "sha512-c2QZpMPWxm1HF71h1EqaxBldx2zLYO0aZ24Bcuo2mUWF79T+F6qOtr7XJCzUDm99NOwhVKQD01a7A8VC6c90CQ==", "requires": { "babel-runtime": "^6.26.0", @@ -14185,7 +14185,7 @@ }, "scheduler": { "version": "0.19.1", - "resolved": "https://verdaccio.sourcefabric.org/scheduler/-/scheduler-0.19.1.tgz", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz", "integrity": "sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==", "requires": { "loose-envify": "^1.1.0", @@ -14463,7 +14463,7 @@ "regexpu-core": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz", - "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=", + "integrity": "sha512-Ci+lDRlvAElKjFp5keqmVUaJLqZiHywekXhshT6wVUyDObGPdymNPhxBmf38ZVsaUGOnZ3Fot9YzxvoI31ymYw==", "requires": { "regenerate": "^1.2.1", "regjsgen": "^0.2.0", @@ -14473,12 +14473,12 @@ "regjsgen": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", - "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=" + "integrity": "sha512-x+Y3yA24uF68m5GA+tBjbGYo64xXVJpbToBaWCoSNSc1hdk6dfctaRWrNFTVJZIIhL5GxW8zwjoixbnifnK59g==" }, "regjsparser": { "version": "0.1.5", "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz", - "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=", + "integrity": "sha512-jlQ9gYLfk2p3V5Ag5fYhA7fv7OHzd1KUH0PRP46xc3TgwjwgROIW572AfYg/X9kaNq/LJnu6oJcFRXlIrGoTRw==", "requires": { "jsesc": "~0.5.0" } @@ -16132,7 +16132,7 @@ "strip-ansi": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "requires": { "ansi-regex": "^2.0.0" } @@ -16674,9 +16674,9 @@ } }, "superdesk-ui-framework": { - "version": "3.0.54", - "resolved": "https://registry.npmjs.org/superdesk-ui-framework/-/superdesk-ui-framework-3.0.54.tgz", - "integrity": "sha512-wWtx2AEJUEShU7v60KteMcPW+vfP0iI3KDnWxnBxsNm6Y7T/nT2ROrd2U5dM/fjNt41jJEiP+AD7mN3ykX8Q4g==", + "version": "3.0.57", + "resolved": "https://registry.npmjs.org/superdesk-ui-framework/-/superdesk-ui-framework-3.0.57.tgz", + "integrity": "sha512-OTVhxvZZltLMWBCVDZ3XJYA261ZjQY/JT6vZHKTIrmlLZ7VCf0oG/hz8okzK1I0rnAp3IBS7tUglsjfec8ZSTg==", "requires": { "@material-ui/lab": "^4.0.0-alpha.56", "@popperjs/core": "^2.4.0", @@ -16699,9 +16699,9 @@ }, "dependencies": { "@types/node": { - "version": "14.18.56", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.56.tgz", - "integrity": "sha512-+k+57NVS9opgrEn5l9c0gvD1r6C+PtyhVE4BTnMMRwiEA8ZO8uFcs6Yy2sXIy0eC95ZurBtRSvhZiHXBysbl6w==" + "version": "14.18.59", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.59.tgz", + "integrity": "sha512-NWJMpBL2Xs3MY93yrD6YrrTKep8eIA6iMnfG4oIc6LrTRlBZgiSCGiY3V/Owlp6umIBLyKb4F8Q7hxWatjYH5A==" }, "cheerio": { "version": "1.0.0-rc.12", @@ -16860,7 +16860,7 @@ "supports-color": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==" + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" }, "svgo": { "version": "0.7.2", @@ -17048,7 +17048,7 @@ }, "tiny-invariant": { "version": "1.3.1", - "resolved": "https://verdaccio.sourcefabric.org/tiny-invariant/-/tiny-invariant-1.3.1.tgz", + "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.1.tgz", "integrity": "sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw==" }, "tinycolor": { @@ -17615,7 +17615,7 @@ }, "use-memo-one": { "version": "1.1.3", - "resolved": "https://verdaccio.sourcefabric.org/use-memo-one/-/use-memo-one-1.1.3.tgz", + "resolved": "https://registry.npmjs.org/use-memo-one/-/use-memo-one-1.1.3.tgz", "integrity": "sha512-g66/K7ZQGYrI6dy8GLpVcMsBp4s17xNkYJVSMvTEevGy3nDxHOfE6z8BVE22+5G5x7t3+bhzrlTDB7ObrEE0cQ==" }, "user-home": { @@ -17738,7 +17738,7 @@ "core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" + "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==" } } }, diff --git a/package.json b/package.json index 258e127b55..2200cd2e8e 100644 --- a/package.json +++ b/package.json @@ -122,7 +122,7 @@ "sass-loader": "6.0.6", "shortid": "2.2.8", "style-loader": "0.20.2", - "superdesk-ui-framework": "^3.0.54", + "superdesk-ui-framework": "^3.0.57", "ts-loader": "3.5.0", "tslint": "5.11.0", "typescript": "4.9.5", From 969a50bd6855a1cb1bad1eacf3392e6090a38b1d Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Tue, 12 Sep 2023 09:47:57 +0200 Subject: [PATCH 27/67] fix e2e test toggle auto spellcheck and hold changes --- e2e/client/specs/authoring_spec.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/e2e/client/specs/authoring_spec.ts b/e2e/client/specs/authoring_spec.ts index 645b5876d4..9467e4bf59 100644 --- a/e2e/client/specs/authoring_spec.ts +++ b/e2e/client/specs/authoring_spec.ts @@ -324,10 +324,10 @@ describe('authoring', () => { it('toggle auto spellcheck and hold changes', () => { monitoring.actionOnItem('Edit', 2, 1); - browser.sleep(300); + browser.sleep(500); expect(element(by.model('spellcheckMenu.isAuto')).getAttribute('checked')).toBeTruthy(); authoring.toggleAutoSpellCheck(); - browser.sleep(300); + browser.sleep(500); expect(element(by.model('spellcheckMenu.isAuto')).getAttribute('checked')).toBeFalsy(); authoring.close(); monitoring.actionOnItem('Edit', 2, 2); From 2c0054ebb663a6a8121b0f1dd2f109adead3bde7 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Tue, 12 Sep 2023 17:21:31 +0200 Subject: [PATCH 28/67] fix e2e test it('can remember last duplicate destination desk', () => { --- e2e/client/specs/helpers/monitoring.ts | 13 ------------- e2e/client/specs/monitoring_spec.ts | 9 ++------- .../utils/get-initial-destination.ts | 6 +++--- 3 files changed, 5 insertions(+), 23 deletions(-) diff --git a/e2e/client/specs/helpers/monitoring.ts b/e2e/client/specs/helpers/monitoring.ts index 2a27570e2e..b0f0237814 100644 --- a/e2e/client/specs/helpers/monitoring.ts +++ b/e2e/client/specs/helpers/monitoring.ts @@ -121,7 +121,6 @@ class Monitoring { searchInput: ElementFinder; getCorrectionItems: (group: any) => any; getTakeItems: (group: any) => any; - getSendToDropdown: () => ElementFinder; getPackageItem: (index: any) => ElementFinder; getPackageItemActionDropdown: (index: any) => ElementFinder; getPackageItemLabelEntry: () => ElementFinder; @@ -962,18 +961,6 @@ class Monitoring { return this.getGroupItems(group).all(by.className('takekey')); }; - /** - * Returns the desk dropdown in send to panel - * - */ - this.getSendToDropdown = () => { - var sidebar = element.all(by.css('.side-panel')).last(), - dropdown = sidebar.element(by.css('.dropdown--boxed .dropdown__toggle')), - dropdownSelected = dropdown.element(by.css('[ng-show="selectedDesk"]')); - - return dropdownSelected; - }; - this.getPackageItem = function(index) { var elemIndex = index ? index : 0; diff --git a/e2e/client/specs/monitoring_spec.ts b/e2e/client/specs/monitoring_spec.ts index 89340cf577..01dbaf36c0 100644 --- a/e2e/client/specs/monitoring_spec.ts +++ b/e2e/client/specs/monitoring_spec.ts @@ -840,18 +840,13 @@ describe('monitoring', () => { authoring.duplicateTo('Sports Desk', 'one'); monitoring.actionOnItemSubmenu('Duplicate', 'Duplicate To', 2, 0); - var dropdownSelected = monitoring.getSendToDropdown(); - - browser.sleep(500); - expect(dropdownSelected.getText()).toEqual('Sports Desk'); + expect(el(['interactive-actions-panel', 'destination-select']).getAttribute('value')).toEqual('Sports Desk'); authoring.duplicateTo('Politic Desk', 'two', true); monitoring.actionOnItemSubmenu('Duplicate', 'Duplicate To', 2, 0); - - dropdownSelected = monitoring.getSendToDropdown(); authoring.close(); browser.sleep(500); - expect(dropdownSelected.getText()).toEqual('Politic Desk'); + expect(el(['interactive-actions-panel', 'destination-select']).getAttribute('value')).toEqual('Politic Desk'); }); it('can view published item as readonly when opened', () => { diff --git a/scripts/core/interactive-article-actions-panel/utils/get-initial-destination.ts b/scripts/core/interactive-article-actions-panel/utils/get-initial-destination.ts index f6505fe01c..12b8b06ef1 100644 --- a/scripts/core/interactive-article-actions-panel/utils/get-initial-destination.ts +++ b/scripts/core/interactive-article-actions-panel/utils/get-initial-destination.ts @@ -18,10 +18,10 @@ export function getInitialDestination( const currentDeskId = sdApi.desks.getCurrentDeskId(); let destinationDesk: string = (() => { - if (currentDeskId != null) { - return currentDeskId; - } else if (lastDestination?.type === 'desk' && lastDestination.desk != null) { + if (lastDestination?.type === 'desk' && lastDestination.desk != null) { return lastDestination.desk; + } else if (currentDeskId != null) { + return currentDeskId; } else if (items.length === 1 && items[0].task?.desk != null) { return items[0].task.desk; } else { From fb9af55f1ed61514daf2df08b47ef85736261aa2 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Wed, 13 Sep 2023 11:33:50 +0200 Subject: [PATCH 29/67] disable e2e test Can create items from templates --- e2e/client/specs/monitoring_spec.ts | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/e2e/client/specs/monitoring_spec.ts b/e2e/client/specs/monitoring_spec.ts index 01dbaf36c0..f6e45e3d6c 100644 --- a/e2e/client/specs/monitoring_spec.ts +++ b/e2e/client/specs/monitoring_spec.ts @@ -890,14 +890,18 @@ describe('monitoring', () => { browser.wait(ECE.invisibilityOf(previewPane)); }); - it('Can create items from templates', () => { + // disabled, because prepopulate script can't setup data + // for fake IDs to work, they have to be defined before usage + // and when template needs desk ID and desk needs template ID - there's no way to do it. + // TODO: reimplement when database snapshots are available + xit('Can create items from templates', () => { const slugline = 'slugline template'; const editorsNote = 'test editor\'s note for template'; monitoring.openMonitoring(); expect(browser.isElementPresent(element(s(['authoring'])))).toBe(false); - el(['content-create']).click(); - el(['content-create-dropdown']).element(by.buttonText('Plain text')).click(); + + authoring.createTextItemFromTemplate('plain text'); expect(browser.isElementPresent(element(s(['authoring'])))).toBe(true); el(['authoring', 'field-slugline']).sendKeys(slugline); @@ -911,9 +915,7 @@ describe('monitoring', () => { el(['authoring', 'close']).click(); expect(browser.isElementPresent(element(s(['authoring'])))).toBe(false); - el(['content-create']).click(); - el(['content-create-dropdown']).element(by.buttonText('More templates...')).click(); - el(['select-template'], by.buttonText(slugline)).click(); + authoring.createTextItemFromTemplate(slugline); browser.sleep(500); // animation expect(browser.isElementPresent(element(s(['authoring'])))).toBe(true); From 585a4b20c3d510a91208a9b7bc440cce552bf959 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Wed, 13 Sep 2023 11:38:48 +0200 Subject: [PATCH 30/67] fixed e2e test warns before spiking --- e2e/client/specs/monitoring_spec.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/e2e/client/specs/monitoring_spec.ts b/e2e/client/specs/monitoring_spec.ts index f6e45e3d6c..4e9f48aee2 100644 --- a/e2e/client/specs/monitoring_spec.ts +++ b/e2e/client/specs/monitoring_spec.ts @@ -11,9 +11,8 @@ import {el, s, els, ECE, articleList, getFocusedElement} from '@superdesk/end-to import {nav} from './helpers/utils'; function createItem(headline: string) { - el(['content-create']).click(); - el(['content-create-dropdown']).element(by.buttonText('More templates...')).click(); - el(['select-template'], by.buttonText('editor3 template')).click(); + authoring.createTextItemFromTemplate('editor3 template'); + browser.wait(ECE.visibilityOf(element(s(['authoring'])))); el(['authoring', 'field--headline'], by.css('[contenteditable]')).sendKeys(headline); From 5753782c6255382c4e7e8c9a1278f463140a9951 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Wed, 13 Sep 2023 13:25:04 +0200 Subject: [PATCH 31/67] fix e2e test stops publishing if there are validation errors --- e2e/client/specs/publishing_spec.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/e2e/client/specs/publishing_spec.ts b/e2e/client/specs/publishing_spec.ts index 4d9802b3b0..855db07cd6 100644 --- a/e2e/client/specs/publishing_spec.ts +++ b/e2e/client/specs/publishing_spec.ts @@ -61,8 +61,9 @@ describe('publishing', () => { executeContextMenuAction(els(['article-item'], null, thirdStage).get(0), 'Edit'); el(['authoring', 'open-send-publish-pane']).click(); - el(['authoring', 'send-publish-pane', 'tab--publish']).click(); - el(['authoring', 'send-publish-pane', 'publish']).click(); + + el(['authoring', 'interactive-actions-panel', 'tabs'], by.buttonText('Publish')).click(); + el(['authoring', 'interactive-actions-panel', 'publish']).click(); assertToastMsg('error', 'SUBJECT is a required field'); assertToastMsg('error', 'BODY HTML is a required field'); From 11deffb4f297a0e3febf8bc5148e37b5f2cb0e46 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Wed, 13 Sep 2023 14:02:18 +0200 Subject: [PATCH 32/67] publish from enabled by default --- .../interactive-article-actions-panel/actions/publish-tab.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/core/interactive-article-actions-panel/actions/publish-tab.tsx b/scripts/core/interactive-article-actions-panel/actions/publish-tab.tsx index 29ab054341..c8c81eb5db 100644 --- a/scripts/core/interactive-article-actions-panel/actions/publish-tab.tsx +++ b/scripts/core/interactive-article-actions-panel/actions/publish-tab.tsx @@ -150,7 +150,7 @@ export class PublishTab extends React.PureComponent { const canPreview: boolean = this.state.subscribers.some(({destinations}) => (destinations ?? []).some(({preview_endpoint_url}) => (preview_endpoint_url ?? '').length > 0), ); - const publishFromEnabled = appConfig.ui.sendAndPublish === true; + const publishFromEnabled = (appConfig.ui.sendAndPublish ?? true) === true; const sectionsFromExtensions = Object.values(extensions) .flatMap(({activationResult}) => activationResult?.contributions?.publishingSections ?? []); From fd63acc5ab6aeb2794efc4c8a01bdfadf403072d Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Wed, 13 Sep 2023 17:13:33 +0200 Subject: [PATCH 33/67] do not persist destination article desk isn't supposed to be changed, except when user chooses "publish from" option that sends to another desk and publishes at the same time. If operation is cancelled, "publish from" value must not be saved --- .../actions/publish-tab.tsx | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/scripts/core/interactive-article-actions-panel/actions/publish-tab.tsx b/scripts/core/interactive-article-actions-panel/actions/publish-tab.tsx index c8c81eb5db..39f1c439fe 100644 --- a/scripts/core/interactive-article-actions-panel/actions/publish-tab.tsx +++ b/scripts/core/interactive-article-actions-panel/actions/publish-tab.tsx @@ -172,19 +172,6 @@ export class PublishTab extends React.PureComponent { onChange={(value) => { this.setState({ selectedDestination: value, - }, () => { - const dest = this.state.selectedDestination; - - if (dest.type === 'desk') { - this.props.onDataChange({ - ...this.props.item, - task: { - ...(this.props.item.task ?? {}), - desk: dest.desk, - stage: dest.stage, - }, - }); - } }); }} includePersonalSpace={false} From 44dbd09b2de067b35803670941cd3a263d424973 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Wed, 13 Sep 2023 17:13:50 +0200 Subject: [PATCH 34/67] display publish buttons vertically as they are displayed at the moment --- .../interactive-article-actions-panel/panel/panel-footer.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/core/interactive-article-actions-panel/panel/panel-footer.tsx b/scripts/core/interactive-article-actions-panel/panel/panel-footer.tsx index 977400b4fd..d37eebaee0 100644 --- a/scripts/core/interactive-article-actions-panel/panel/panel-footer.tsx +++ b/scripts/core/interactive-article-actions-panel/panel/panel-footer.tsx @@ -13,7 +13,9 @@ export class PanelFooter extends React.PureComponent { } else { return (
- {this.props.children} +
+ {this.props.children} +
); } From fd0c822e8319770f62bb350ac94591abbeff5291 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Thu, 14 Sep 2023 11:36:04 +0200 Subject: [PATCH 35/67] fix e2e test can send and publish --- e2e/client/specs/publishing_spec.ts | 23 +++---- .../actions/publish-tab.tsx | 64 +++++++++---------- .../utils/get-initial-destination.ts | 10 +++ 3 files changed, 53 insertions(+), 44 deletions(-) diff --git a/e2e/client/specs/publishing_spec.ts b/e2e/client/specs/publishing_spec.ts index 855db07cd6..97f4033c7a 100644 --- a/e2e/client/specs/publishing_spec.ts +++ b/e2e/client/specs/publishing_spec.ts @@ -82,9 +82,7 @@ describe('publishing', () => { it('can send and publish', () => { workspace.selectDesk('Politic Desk'); - el(['content-create']).click(); - el(['content-create-dropdown']).element(by.buttonText('More templates...')).click(); - el(['select-template'], by.buttonText('testing')).click(); + authoring.createTextItemFromTemplate('testing'); const slugline = 'testing-send-and-publish'; @@ -92,19 +90,22 @@ describe('publishing', () => { el(['authoring', 'save']).click(); el(['authoring', 'open-send-publish-pane']).click(); - el(['authoring', 'send-publish-pane', 'tab--publish']).click(); - el(['authoring', 'send-publish-pane', 'publish-from--options', 'desk-select--handle']).click(); - el( - ['authoring', 'send-publish-pane', 'publish-from--options', 'desk-select--options'], - by.buttonText('Sports Desk'), - ).click(); - el(['authoring', 'send-publish-pane', 'publish-from--submit']).click(); + el(['authoring', 'interactive-actions-panel', 'tabs'], by.buttonText('Publish')).click(); + + el(['interactive-actions-panel', 'destination-select']).click(); + + // doesn't work using full selector; TODO: update to use tree select + element(by.cssContainingText('option', 'Sports Desk')).click(); + + el(['authoring', 'interactive-actions-panel', 'publish-from']).click(); assertToastMsg('success', 'Item published.'); - browser.wait(ECE.stalenessOf(element(by.cssContainingText( + const firstGroup = els(['monitoring-group']).get(0); + + browser.wait(ECE.stalenessOf(firstGroup.element(by.cssContainingText( '[data-test-id="article-item"] [data-test-id="field--slugline"]', slugline, ))), MONITORING_DEBOUNCE_MAX_WAIT); diff --git a/scripts/core/interactive-article-actions-panel/actions/publish-tab.tsx b/scripts/core/interactive-article-actions-panel/actions/publish-tab.tsx index 39f1c439fe..4f590d5be8 100644 --- a/scripts/core/interactive-article-actions-panel/actions/publish-tab.tsx +++ b/scripts/core/interactive-article-actions-panel/actions/publish-tab.tsx @@ -6,7 +6,7 @@ import {PanelContent} from '../panel/panel-content'; import {PanelFooter} from '../panel/panel-footer'; import {DestinationSelect} from '../subcomponents/destination-select'; import {IPanelError, ISendToDestination} from '../interfaces'; -import {getInitialDestination} from '../utils/get-initial-destination'; +import {getCurrentDeskDestination} from '../utils/get-initial-destination'; import { IPublishingDateOptions, getInitialPublishingDateOptions, @@ -51,7 +51,7 @@ export class PublishTab extends React.PureComponent { this.state = { ...getInitialPublishingDateOptions([this.props.item]), - selectedDestination: getInitialDestination([this.props.item], false), + selectedDestination: getCurrentDeskDestination(), publishingDateOptions: getInitialPublishingDateOptions([props.item]), publishingTarget: { target_subscribers: this.props.item.target_subscribers ?? [], @@ -74,44 +74,41 @@ export class PublishTab extends React.PureComponent { doPublish(applyDestination?: boolean): void { this.props.handleUnsavedChanges() .then((item) => { - let itemToPublish: IArticle = { - ...item, - ...getPublishingDatePatch(item, this.state.publishingDateOptions), - ...getPublishingTargetPatch(item, this.state.publishingTarget), - }; + const emptyPatches: Array> = [{}]; - if ( + const afterSending = applyDestination === true && this.state.selectedDestination.type === 'desk' && this.otherDeskSelected() - ) { - itemToPublish = { - ...itemToPublish, - task: { - ...(itemToPublish.task ?? {}), - desk: this.state.selectedDestination.desk, - stage: this.state.selectedDestination.stage, - }, + ? sdApi.article.sendItems([item], this.state.selectedDestination) + : Promise.resolve(emptyPatches); + + afterSending.then(([patchAfterSending]) => { + let itemToPublish: IArticle = { + ...item, + ...patchAfterSending, + ...getPublishingDatePatch(item, this.state.publishingDateOptions), + ...getPublishingTargetPatch(item, this.state.publishingTarget), }; - } - const confirmed = appConfig?.features?.confirmDueDate === true - ? confirmPublish([itemToPublish]) - : Promise.resolve(); + const confirmed = appConfig?.features?.confirmDueDate === true + ? confirmPublish([itemToPublish]) + : Promise.resolve(); - confirmed.then(() => { - // Cloning to prevent objects from being modified by angular - sdApi.article.publishItem( - cloneDeep(this.props.item), - cloneDeep(itemToPublish), - 'publish', - this.props.onError, - ) - .then(() => { - ng.get('authoringWorkspace').close(); - ng.get('$rootScope').$applyAsync(); // required for authoring close to take effect - notify.success('Item published.'); - }); + confirmed.then(() => { + // Cloning to prevent objects from being modified by angular + sdApi.article.publishItem( + cloneDeep(item), + cloneDeep(itemToPublish), + 'publish', + this.props.onError, + ) + .then(() => { + ng.get('authoringWorkspace').close(); + ng.get('$rootScope').$applyAsync(); // required for authoring close to take effect + notify.success('Item published.'); + }); + }); }); }) .catch(() => { @@ -261,6 +258,7 @@ export class PublishTab extends React.PureComponent { type="primary" expand style="hollow" + data-test-id="publish-from" /> ) } diff --git a/scripts/core/interactive-article-actions-panel/utils/get-initial-destination.ts b/scripts/core/interactive-article-actions-panel/utils/get-initial-destination.ts index 12b8b06ef1..75b25c12a8 100644 --- a/scripts/core/interactive-article-actions-panel/utils/get-initial-destination.ts +++ b/scripts/core/interactive-article-actions-panel/utils/get-initial-destination.ts @@ -84,3 +84,13 @@ export function getInitialDestination( return destination; } + +export function getCurrentDeskDestination(): ISendToDestination { + let destinationDesk: string = sdApi.desks.getCurrentDeskId(); + + return { + type: 'desk', + desk: destinationDesk, + stage: null, + }; +} From ca35811ee4ca1c56ed3ad9ef4c0cc4dab15d0521 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Thu, 14 Sep 2023 12:00:20 +0200 Subject: [PATCH 36/67] fix e2e test can search by search field --- e2e/client/specs/search_spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e/client/specs/search_spec.ts b/e2e/client/specs/search_spec.ts index b03647fabe..e70ea97416 100644 --- a/e2e/client/specs/search_spec.ts +++ b/e2e/client/specs/search_spec.ts @@ -126,7 +126,7 @@ describe('search', () => { authoring.sendTo('Politic Desk'); authoring.confirmSendTo(); monitoring.switchToDesk('POLITIC DESK'); - expect(monitoring.getTextItem(1, 0)).toBe('From-Sports-To-Politics'); + expect(monitoring.getTextItem(0, 0)).toBe('From-Sports-To-Politics'); // search by from desk field globalSearch.openGlobalSearch(); From 7be5881e987d75b8b5939dab23c414d9e7dea08d Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Thu, 14 Sep 2023 12:10:03 +0200 Subject: [PATCH 37/67] fix e2e test can display embargo item when set --- e2e/client/specs/helpers/authoring.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/e2e/client/specs/helpers/authoring.ts b/e2e/client/specs/helpers/authoring.ts index e891cc4754..f76e6f532a 100644 --- a/e2e/client/specs/helpers/authoring.ts +++ b/e2e/client/specs/helpers/authoring.ts @@ -268,8 +268,8 @@ class Authoring { var embargoDate = '09/09/' + ((new Date()).getFullYear() + 1); var embargoTime = '04:00'; - element(by.model('item.embargo_date')).element(by.tagName('input')).sendKeys(embargoDate); - element(by.model('item.embargo_time')).element(by.tagName('input')).sendKeys(embargoTime); + el(['authoring', 'interactive-actions-panel', 'embargo', 'date-input']).sendKeys(embargoDate); + el(['authoring', 'interactive-actions-panel', 'embargo', 'time-input']).sendKeys(embargoTime); }; this.confirmSendTo = function() { From 6ec12da5fb1313f87655c5c2f928e82c5b75a103 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Thu, 14 Sep 2023 12:30:38 +0200 Subject: [PATCH 38/67] fix e2e test can search scheduled --- e2e/client/specs/search_spec.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/e2e/client/specs/search_spec.ts b/e2e/client/specs/search_spec.ts index e70ea97416..c7b39b61d8 100644 --- a/e2e/client/specs/search_spec.ts +++ b/e2e/client/specs/search_spec.ts @@ -7,7 +7,7 @@ import {globalSearch} from './helpers/search'; import {content} from './helpers/content'; import {authoring} from './helpers/authoring'; import {nav, scrollToView} from './helpers/utils'; -import {ECE} from '@superdesk/end-to-end-testing-helpers'; +import {ECE, el} from '@superdesk/end-to-end-testing-helpers'; describe('search', () => { beforeEach(() => { @@ -282,6 +282,9 @@ describe('search', () => { globalSearch.waitForItemCount(16); globalSearch.actionOnItem('Edit', 'item9'); authoring.schedule(false); + + browser.wait(ECE.stalenessOf(el(['notification--success']))); + globalSearch.openFilterPanel(); globalSearch.openParameters(); globalSearch.toggleSearchTabs('filters'); From 9aa4a47555a2c5454d1a1c1abade3069cac6c070 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Thu, 14 Sep 2023 12:50:29 +0200 Subject: [PATCH 39/67] fix e2e test can submit item to a desk --- e2e/client/specs/helpers/authoring.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e/client/specs/helpers/authoring.ts b/e2e/client/specs/helpers/authoring.ts index f76e6f532a..b4b455b282 100644 --- a/e2e/client/specs/helpers/authoring.ts +++ b/e2e/client/specs/helpers/authoring.ts @@ -286,7 +286,7 @@ class Authoring { el(['authoring', 'interactive-actions-panel', 'destination-select']).click(); // doesn't work using full selector; TODO: update to use tree select - element(by.cssContainingText('option', desk)).click(); + element(by.cssContainingText('[data-test-id="destination-select"] option', desk)).click(); if (stage) { el( From f61c77a9106ba7d061922a97788f3605ad634b78 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Thu, 14 Sep 2023 13:00:10 +0200 Subject: [PATCH 40/67] fix e2e test can open send to panel when monitoring list is hidden --- e2e/client/specs/helpers/authoring.ts | 2 -- e2e/client/specs/send_spec.ts | 4 +++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/e2e/client/specs/helpers/authoring.ts b/e2e/client/specs/helpers/authoring.ts index b4b455b282..9656a7c908 100644 --- a/e2e/client/specs/helpers/authoring.ts +++ b/e2e/client/specs/helpers/authoring.ts @@ -29,7 +29,6 @@ class Authoring { compareVersionsMenuItem: any; setCategoryBtn: any; getCategoryListItems: any; - sendItemContainer: any; linkToMasterButton: any; marked_for_legal: any; sms: any; @@ -208,7 +207,6 @@ class Authoring { this.getCategoryListItems = element(by.id('category-setting')) .all(el(['dropdown__item']).locator()); - this.sendItemContainer = element(by.id('send-item-container')); this.linkToMasterButton = element(by.id('preview-master')); this.marked_for_legal = element(by.model('item.flags.marked_for_legal')); this.sms = element(by.model('item.flags.marked_for_sms')); diff --git a/e2e/client/specs/send_spec.ts b/e2e/client/specs/send_spec.ts index cd94f35b93..baff148acd 100644 --- a/e2e/client/specs/send_spec.ts +++ b/e2e/client/specs/send_spec.ts @@ -6,6 +6,7 @@ import {monitoring} from './helpers/monitoring'; import {workspace} from './helpers/workspace'; import {content} from './helpers/content'; import {authoring} from './helpers/authoring'; +import {ECE, el} from '@superdesk/end-to-end-testing-helpers'; describe('send', () => { function getItemState(index) { @@ -72,7 +73,8 @@ describe('send', () => { expect(monitoring.hasClass(element(by.id('main-container')), 'hideMonitoring')).toBe(true); authoring.sendToButton.click(); - expect(authoring.sendItemContainer.isDisplayed()).toBe(true); + + browser.wait(ECE.visibilityOf(el(['interactive-actions-panel']))); }); it('can display monitoring after submitting an item to a desk using full view of authoring', () => { From a81d0402219f2e7d9766d45cc647038443aefc59 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Thu, 14 Sep 2023 13:18:34 +0200 Subject: [PATCH 41/67] fix e2e test can display monitoring after submitting an item to a desk using full view of authoring --- scripts/apps/authoring-bridge/authoring-api-common.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/apps/authoring-bridge/authoring-api-common.ts b/scripts/apps/authoring-bridge/authoring-api-common.ts index 4d77ad285e..b55bf2a1bb 100644 --- a/scripts/apps/authoring-bridge/authoring-api-common.ts +++ b/scripts/apps/authoring-bridge/authoring-api-common.ts @@ -103,6 +103,8 @@ export const authoringApiCommon: IAuthoringApiCommon = { } }, closeAuthoringForce: () => { + ng.get('superdeskFlags').flags.hideMonitoring = false; + ng.get('authoringWorkspace').close(); }, }; From 576d4f83386706144895bac5c0121447fdf91f10 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Thu, 14 Sep 2023 13:38:52 +0200 Subject: [PATCH 42/67] fix e2e test can remember last sent destination desk and stage --- e2e/client/specs/send_spec.ts | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/e2e/client/specs/send_spec.ts b/e2e/client/specs/send_spec.ts index baff148acd..0b939a74de 100644 --- a/e2e/client/specs/send_spec.ts +++ b/e2e/client/specs/send_spec.ts @@ -128,12 +128,9 @@ describe('send', () => { monitoring.showHideList(); authoring.sendToButton.click(); - var sidebar = element.all(by.css('.side-panel')).last(), - dropdown = sidebar.element(by.css('.dropdown--boxed .dropdown__toggle')), - dropdownSelected = dropdown.element(by.css('[ng-show="selectedDesk"]')); + el(['authoring', 'interactive-actions-panel', 'tabs'], by.buttonText('Send to')).click(); - browser.sleep(500); - expect(dropdownSelected.getText()).toEqual('Politic Desk'); + expect(el(['interactive-actions-panel', 'destination-select']).getAttribute('value')).toEqual('Politic Desk'); }); it('can remember last sent destination desk and stage on multi selection sendTo panel', () => { From 4b2ab3eda8b57f86b7ad78b3c06d50eda0e977f9 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Thu, 14 Sep 2023 20:48:39 +0200 Subject: [PATCH 43/67] fix e2e test can remember last sent destination desk and stage on multi selection sendTo panel --- e2e/client/specs/helpers/authoring.ts | 10 +++++----- e2e/client/specs/send_spec.ts | 15 ++++++--------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/e2e/client/specs/helpers/authoring.ts b/e2e/client/specs/helpers/authoring.ts index 9656a7c908..7c53dc9950 100644 --- a/e2e/client/specs/helpers/authoring.ts +++ b/e2e/client/specs/helpers/authoring.ts @@ -279,23 +279,23 @@ class Authoring { }; this.sendToSidebarOpened = function(desk, stage, _continue) { - el(['authoring', 'interactive-actions-panel', 'tabs'], by.buttonText('Send to')).click(); + el(['interactive-actions-panel', 'tabs'], by.buttonText('Send to')).click(); - el(['authoring', 'interactive-actions-panel', 'destination-select']).click(); + el(['interactive-actions-panel', 'destination-select']).click(); // doesn't work using full selector; TODO: update to use tree select element(by.cssContainingText('[data-test-id="destination-select"] option', desk)).click(); if (stage) { el( - ['authoring', 'interactive-actions-panel', 'stage-select'], + ['interactive-actions-panel', 'stage-select'], by.cssContainingText('[data-test-id="item"]', stage), ).click(); } if (_continue) { - el(['authoring', 'interactive-actions-panel', 'send-and-open']).click(); + el(['interactive-actions-panel', 'send-and-open']).click(); } else { - el(['authoring', 'interactive-actions-panel', 'send']).click(); + el(['interactive-actions-panel', 'send']).click(); } }; diff --git a/e2e/client/specs/send_spec.ts b/e2e/client/specs/send_spec.ts index 0b939a74de..3b2435edfe 100644 --- a/e2e/client/specs/send_spec.ts +++ b/e2e/client/specs/send_spec.ts @@ -153,15 +153,12 @@ describe('send', () => { // open sendTo panel monitoring.openSendMenu(); - var sidebar = element.all(by.css('.side-panel')).last(), - dropdown = sidebar.element(by.css('.dropdown--boxed .dropdown__toggle')), - dropdownSelected = dropdown.element(by.css('[ng-show="selectedDesk"]')); + expect( + el(['interactive-actions-panel', 'destination-select']).getAttribute('value'), + ).toEqual('Sports Desk'); - browser.sleep(100); - expect(dropdownSelected.getText()).toEqual('Sports Desk'); // desk remembered - - var btnStage = sidebar.element(by.buttonText('Working Stage')); - - expect(btnStage.getAttribute('class')).toContain('active'); // stage remembered + expect( + el(['interactive-actions-panel', 'stage-select']).getAttribute('data-test-value'), + ).toEqual('Working Stage'); }); }); From 5669e483e2852118c67e82ddc3b7474a7389651e Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Thu, 14 Sep 2023 20:55:03 +0200 Subject: [PATCH 44/67] fix e2e test can spike and unspike multiple items --- e2e/client/specs/helpers/content.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e/client/specs/helpers/content.ts b/e2e/client/specs/helpers/content.ts index 11cc465480..935ac47474 100644 --- a/e2e/client/specs/helpers/content.ts +++ b/e2e/client/specs/helpers/content.ts @@ -162,7 +162,7 @@ class Content { this.unspikeItems = function() { multiAction('Unspike'); - element(by.buttonText('send')).click(); + el(['interactive-actions-panel', 'unspike']).click(); }; this.selectSpikedList = function() { From f06092a4e1b40feab8a46f19668d2a941672309d Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Thu, 14 Sep 2023 21:05:35 +0200 Subject: [PATCH 45/67] superdesk-ui-framework@3.0.58 --- package-lock.json | 12 ++++++------ package.json | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9a109ebb3a..114e2c60d3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1000,7 +1000,7 @@ "object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==" + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" }, "prop-types": { "version": "15.8.1", @@ -16132,7 +16132,7 @@ "strip-ansi": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "requires": { "ansi-regex": "^2.0.0" } @@ -16674,9 +16674,9 @@ } }, "superdesk-ui-framework": { - "version": "3.0.57", - "resolved": "https://registry.npmjs.org/superdesk-ui-framework/-/superdesk-ui-framework-3.0.57.tgz", - "integrity": "sha512-OTVhxvZZltLMWBCVDZ3XJYA261ZjQY/JT6vZHKTIrmlLZ7VCf0oG/hz8okzK1I0rnAp3IBS7tUglsjfec8ZSTg==", + "version": "3.0.58", + "resolved": "https://registry.npmjs.org/superdesk-ui-framework/-/superdesk-ui-framework-3.0.58.tgz", + "integrity": "sha512-qFcACrkLhAz1h/qNqVR5To+CaEJ2SThtWojJTbjcOiRgR4MOgjgUaZy2xnUrtO+VO6RyeaggiT6yx6G+jRFuEA==", "requires": { "@material-ui/lab": "^4.0.0-alpha.56", "@popperjs/core": "^2.4.0", @@ -16860,7 +16860,7 @@ "supports-color": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==" + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" }, "svgo": { "version": "0.7.2", diff --git a/package.json b/package.json index 2200cd2e8e..4d3c068d8e 100644 --- a/package.json +++ b/package.json @@ -122,7 +122,7 @@ "sass-loader": "6.0.6", "shortid": "2.2.8", "style-loader": "0.20.2", - "superdesk-ui-framework": "^3.0.57", + "superdesk-ui-framework": "^3.0.58", "ts-loader": "3.5.0", "tslint": "5.11.0", "typescript": "4.9.5", From 29c8cfd8edb24629cfbbd3744996ec1952df56d3 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Fri, 15 Sep 2023 10:28:43 +0200 Subject: [PATCH 46/67] fix e2e test can manage templates --- e2e/client/specs/templates_spec.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/e2e/client/specs/templates_spec.ts b/e2e/client/specs/templates_spec.ts index 3880ac1cc8..6b14a20d21 100644 --- a/e2e/client/specs/templates_spec.ts +++ b/e2e/client/specs/templates_spec.ts @@ -21,7 +21,7 @@ describe('templates', () => { templates.openTemplatesSettings(); templates.add(); templates.getTemplateNameElement().sendKeys('New Template'); - templates.selectProfile('Text'); + templates.selectProfile('Plain text'); templates.setTemplateType('string:create'); templates.selectDesk('Politic Desk'); templates.selectDesk('Sports Desk'); @@ -44,14 +44,14 @@ describe('templates', () => { // check the New Template is accessable from both desks monitoring.openMonitoring(); workspace.selectDesk('Sports Desk'); - authoring.createTextItemFromTemplate('new'); + authoring.createTextItemFromTemplate('new template'); expect(authoring.getBodyText()).toBe('This is body from the template'); expect(authoring.getHeaderSluglineText()).toBe('Test Template'); expect(authoring.getHeadlineText()).toBe('New Item'); authoring.close(); workspace.selectDesk('Politic Desk'); - authoring.createTextItemFromTemplate('new'); + authoring.createTextItemFromTemplate('new template'); expect(authoring.getBodyText()).toBe('This is body from the template'); expect(authoring.getHeaderSluglineText()).toBe('Test Template'); expect(authoring.getHeadlineText()).toBe('New Item'); @@ -61,7 +61,7 @@ describe('templates', () => { templates.openTemplatesSettings(); templates.add(); templates.getTemplateNameElement().sendKeys('Second New Template'); - templates.selectProfile('Text'); + templates.selectProfile('Plain text'); templates.setTemplateType('string:create'); templates.selectDesk('Politic Desk'); templates.selectDesk('Sports Desk'); From 11046f4d33e98d69558902dde6a3b0e3cd7405f8 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Fri, 15 Sep 2023 10:37:59 +0200 Subject: [PATCH 47/67] fix lint --- e2e/client/specs/publishing_spec.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/e2e/client/specs/publishing_spec.ts b/e2e/client/specs/publishing_spec.ts index 97f4033c7a..1c4a0ef3b0 100644 --- a/e2e/client/specs/publishing_spec.ts +++ b/e2e/client/specs/publishing_spec.ts @@ -91,7 +91,6 @@ describe('publishing', () => { el(['authoring', 'open-send-publish-pane']).click(); - el(['authoring', 'interactive-actions-panel', 'tabs'], by.buttonText('Publish')).click(); el(['interactive-actions-panel', 'destination-select']).click(); From 1e70de44fab5babb45030d7704b365b8cbc239d7 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Fri, 15 Sep 2023 11:27:08 +0200 Subject: [PATCH 48/67] fixed bug - funciton was invoking a promise but not waiting for it e2e - can show version and item history for an item --- .../versioning/history/HistoryController.ts | 57 +++++++++++-------- 1 file changed, 32 insertions(+), 25 deletions(-) diff --git a/scripts/apps/authoring/versioning/history/HistoryController.ts b/scripts/apps/authoring/versioning/history/HistoryController.ts index f63d06d6b6..b1fd919af1 100644 --- a/scripts/apps/authoring/versioning/history/HistoryController.ts +++ b/scripts/apps/authoring/versioning/history/HistoryController.ts @@ -135,31 +135,38 @@ export function getHistoryItems(item: IArticle): Promise> { .then((historyItems) => { let historyVersion = historyItems.length && historyItems[0].version || 200; - if (!historyItems.length || historyItems[0].version > 1) { - // no or partial history so get versions - archiveService.getVersions(item, desks, 'operations').then((versions) => { - let processedVersions = versions.map(processVersion); - - // use versions where version number is less than the history - historyItemsResult = _.filter(processedVersions, (v) => v.version < historyVersion); - - // if there's any history items then merge them - if (historyItems.length) { - historyItemsResult = historyItemsResult.concat(historyItems); - } - }); - } else { - historyItemsResult = historyItems; - } - - // Filter out item_lock and item_unlock history entries - if (historyItemsResult && historyItemsResult.length > 0) { - historyItemsResult = historyItemsResult.filter( - (entry) => !entry.operation || ['item_lock', 'item_unlock'].indexOf(entry.operation) < 0, - ); - } - - resolve(historyItemsResult); + const waitForVersions = new Promise((resolveVersions) => { + if (!historyItems.length || historyItems[0].version > 1) { + // no or partial history so get versions + archiveService.getVersions(item, desks, 'operations').then((versions) => { + let processedVersions = versions.map(processVersion); + + // use versions where version number is less than the history + historyItemsResult = _.filter(processedVersions, (v) => v.version < historyVersion); + + // if there's any history items then merge them + if (historyItems.length) { + historyItemsResult = historyItemsResult.concat(historyItems); + } + + resolveVersions(); + }); + } else { + historyItemsResult = historyItems; + resolveVersions(); + } + }); + + waitForVersions.then(() => { + // Filter out item_lock and item_unlock history entries + if (historyItemsResult && historyItemsResult.length > 0) { + historyItemsResult = historyItemsResult.filter( + (entry) => !entry.operation || ['item_lock', 'item_unlock'].indexOf(entry.operation) < 0, + ); + } + + resolve(historyItemsResult); + }); }) .catch(() => { reject(null); From 83d0b4e5ca316bfc39a2f870a0a2fbc01e883c1e Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Mon, 18 Sep 2023 12:44:48 +0200 Subject: [PATCH 49/67] use tree select for destination select; adjust e2e tests --- e2e/client/specs/helpers/authoring.ts | 21 +++---- .../specs/helpers/tree-select-driver.ts | 44 +++++++++++++ e2e/client/specs/monitoring_spec.ts | 17 ++++- e2e/client/specs/publishing_spec.ts | 8 +-- e2e/client/specs/send_spec.ts | 13 +++- .../core/ui/components/select-filterable.tsx | 62 +++++-------------- 6 files changed, 98 insertions(+), 67 deletions(-) create mode 100644 e2e/client/specs/helpers/tree-select-driver.ts diff --git a/e2e/client/specs/helpers/authoring.ts b/e2e/client/specs/helpers/authoring.ts index 7c53dc9950..3af555241e 100644 --- a/e2e/client/specs/helpers/authoring.ts +++ b/e2e/client/specs/helpers/authoring.ts @@ -4,6 +4,7 @@ import {element, by, browser, protractor} from 'protractor'; import {waitHidden, waitFor, click} from './utils'; import {ECE, els, el} from '@superdesk/end-to-end-testing-helpers'; import {PLAIN_TEXT_TEMPLATE_NAME} from './constants'; +import {TreeSelectDriver} from './tree-select-driver'; class Authoring { lock: any; @@ -281,10 +282,9 @@ class Authoring { this.sendToSidebarOpened = function(desk, stage, _continue) { el(['interactive-actions-panel', 'tabs'], by.buttonText('Send to')).click(); - el(['interactive-actions-panel', 'destination-select']).click(); - - // doesn't work using full selector; TODO: update to use tree select - element(by.cssContainingText('[data-test-id="destination-select"] option', desk)).click(); + new TreeSelectDriver( + el(['interactive-actions-panel', 'destination-select']), + ).setValue(desk); if (stage) { el( @@ -300,10 +300,9 @@ class Authoring { }; this.duplicateTo = (desk, stage, open) => { - el(['interactive-actions-panel', 'destination-select']).click(); - - // doesn't work using full selector; TODO: update to use tree select - element(by.cssContainingText('option', desk)).click(); + new TreeSelectDriver( + el(['interactive-actions-panel', 'destination-select']), + ).setValue(desk); if (stage) { el( @@ -319,9 +318,9 @@ class Authoring { }; this.selectDeskforSendTo = function(desk) { - el(['interactive-actions-panel', 'destination-select']).click(); - - element(by.cssContainingText('[data-test-id="interactive-actions-panel"] option', desk)).click(); + new TreeSelectDriver( + el(['interactive-actions-panel', 'destination-select']), + ).setValue(desk); }; this.markAction = function() { diff --git a/e2e/client/specs/helpers/tree-select-driver.ts b/e2e/client/specs/helpers/tree-select-driver.ts new file mode 100644 index 0000000000..c2f4162070 --- /dev/null +++ b/e2e/client/specs/helpers/tree-select-driver.ts @@ -0,0 +1,44 @@ +import {by, element, ElementFinder, promise, protractor} from 'protractor'; +import {el, els, s} from '@superdesk/end-to-end-testing-helpers'; + +export class TreeSelectDriver { + private _element: ElementFinder; + + constructor(_element: ElementFinder) { + this._element = _element; + + this.getValue = this.getValue.bind(this); + this.addValue = this.addValue.bind(this); + this.setValue = this.setValue.bind(this); + } + + getValue(): promise.Promise> { + return els(['item'], null, this._element).then((elements) => { + return protractor.promise.all( + elements.map((_el: ElementFinder) => { + return _el.getAttribute('innerText'); + }), + ); + }); + } + + addValue(value: string): void { + el(['open-popover'], null, this._element).click(); + + const dropdown = element(by.id('TREESELECT_DROPDOWN')); + + dropdown.element(by.cssContainingText('[data-test-id="option"]', value)).click(); + } + + setValue(value: string) { + const maybeClearButton = this._element.element(s(['clear-value'])); + + maybeClearButton.isPresent().then((present) => { + if (present === true) { + maybeClearButton.click(); + } + }); + + this.addValue(value); + } +} diff --git a/e2e/client/specs/monitoring_spec.ts b/e2e/client/specs/monitoring_spec.ts index 4e9f48aee2..fe2fee259c 100644 --- a/e2e/client/specs/monitoring_spec.ts +++ b/e2e/client/specs/monitoring_spec.ts @@ -1,11 +1,12 @@ /* eslint-disable newline-per-chained-call */ -import {element, browser, by, protractor, WebElementPromise, ElementFinder} from 'protractor'; +import {element, browser, by, protractor, ElementFinder} from 'protractor'; import {monitoring} from './helpers/monitoring'; import {workspace} from './helpers/workspace'; import {authoring} from './helpers/authoring'; import {dashboard} from './helpers/dashboard'; +import {TreeSelectDriver} from './helpers/tree-select-driver'; import {desks} from './helpers/desks'; import {el, s, els, ECE, articleList, getFocusedElement} from '@superdesk/end-to-end-testing-helpers'; import {nav} from './helpers/utils'; @@ -839,13 +840,23 @@ describe('monitoring', () => { authoring.duplicateTo('Sports Desk', 'one'); monitoring.actionOnItemSubmenu('Duplicate', 'Duplicate To', 2, 0); - expect(el(['interactive-actions-panel', 'destination-select']).getAttribute('value')).toEqual('Sports Desk'); + expect( + new TreeSelectDriver( + el(['interactive-actions-panel', 'destination-select']), + ).getValue(), + ).toEqual(['Sports Desk']); + authoring.duplicateTo('Politic Desk', 'two', true); monitoring.actionOnItemSubmenu('Duplicate', 'Duplicate To', 2, 0); authoring.close(); browser.sleep(500); - expect(el(['interactive-actions-panel', 'destination-select']).getAttribute('value')).toEqual('Politic Desk'); + + expect( + new TreeSelectDriver( + el(['interactive-actions-panel', 'destination-select']), + ).getValue(), + ).toEqual(['Politic Desk']); }); it('can view published item as readonly when opened', () => { diff --git a/e2e/client/specs/publishing_spec.ts b/e2e/client/specs/publishing_spec.ts index 1c4a0ef3b0..335e159573 100644 --- a/e2e/client/specs/publishing_spec.ts +++ b/e2e/client/specs/publishing_spec.ts @@ -9,6 +9,7 @@ import {workspace} from './helpers/workspace'; import {authoring} from './helpers/authoring'; import {el, els, ECE} from '@superdesk/end-to-end-testing-helpers'; import {executeContextMenuAction} from '@superdesk/end-to-end-testing-helpers/dist/articlesList'; +import {TreeSelectDriver} from './helpers/tree-select-driver'; describe('publishing', () => { beforeEach(monitoring.openMonitoring); @@ -93,10 +94,9 @@ describe('publishing', () => { el(['authoring', 'interactive-actions-panel', 'tabs'], by.buttonText('Publish')).click(); - el(['interactive-actions-panel', 'destination-select']).click(); - - // doesn't work using full selector; TODO: update to use tree select - element(by.cssContainingText('option', 'Sports Desk')).click(); + new TreeSelectDriver( + el(['interactive-actions-panel', 'destination-select']), + ).setValue('Sports Desk'); el(['authoring', 'interactive-actions-panel', 'publish-from']).click(); diff --git a/e2e/client/specs/send_spec.ts b/e2e/client/specs/send_spec.ts index 3b2435edfe..ec4b569bc9 100644 --- a/e2e/client/specs/send_spec.ts +++ b/e2e/client/specs/send_spec.ts @@ -7,6 +7,7 @@ import {workspace} from './helpers/workspace'; import {content} from './helpers/content'; import {authoring} from './helpers/authoring'; import {ECE, el} from '@superdesk/end-to-end-testing-helpers'; +import {TreeSelectDriver} from './helpers/tree-select-driver'; describe('send', () => { function getItemState(index) { @@ -130,7 +131,11 @@ describe('send', () => { el(['authoring', 'interactive-actions-panel', 'tabs'], by.buttonText('Send to')).click(); - expect(el(['interactive-actions-panel', 'destination-select']).getAttribute('value')).toEqual('Politic Desk'); + expect( + new TreeSelectDriver( + el(['interactive-actions-panel', 'destination-select']), + ).getValue(), + ).toEqual(['Politic Desk']); }); it('can remember last sent destination desk and stage on multi selection sendTo panel', () => { @@ -154,8 +159,10 @@ describe('send', () => { monitoring.openSendMenu(); expect( - el(['interactive-actions-panel', 'destination-select']).getAttribute('value'), - ).toEqual('Sports Desk'); + new TreeSelectDriver( + el(['interactive-actions-panel', 'destination-select']), + ).getValue(), + ).toEqual(['Sports Desk']); expect( el(['interactive-actions-panel', 'stage-select']).getAttribute('data-test-value'), diff --git a/scripts/core/ui/components/select-filterable.tsx b/scripts/core/ui/components/select-filterable.tsx index 860ed39974..b3b7a744f6 100644 --- a/scripts/core/ui/components/select-filterable.tsx +++ b/scripts/core/ui/components/select-filterable.tsx @@ -16,58 +16,28 @@ interface IProps { 'data-test-id'?: string; } -export class SelectFilterable extends React.PureComponent> { // TODO: use tree select when fixed +export class SelectFilterable extends React.PureComponent> { render() { const {items, value, getLabel, onChange, required, zIndex, disabled} = this.props; return ( - + /> ); - - // return ( - // items.map((item) => ({value: item}))} - // onChange={(val) => { - // onChange(val[0] ?? null); - // }} - // getLabel={getLabel} - // getId={getLabel} - // required={required} - // disabled={disabled} - // zIndex={zIndex} - // data-test-id={this.props['data-test-id']} - // /> - // ); } } From 78e0f073f57d336ef7147aa79e2823b385485340 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Mon, 18 Sep 2023 12:52:38 +0200 Subject: [PATCH 50/67] add spacing for authoring switch --- scripts/core/menu/views/menu.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/core/menu/views/menu.html b/scripts/core/menu/views/menu.html index 66810f7502..a3e7c346aa 100644 --- a/scripts/core/menu/views/menu.html +++ b/scripts/core/menu/views/menu.html @@ -33,7 +33,7 @@

- + From e712e71a141550f78cf09fbdda9dd4164fd2e9c8 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Mon, 18 Sep 2023 12:53:15 +0200 Subject: [PATCH 51/67] hide authoring switch while new authoring isn't released yet --- scripts/core/menu/views/menu.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/core/menu/views/menu.html b/scripts/core/menu/views/menu.html index a3e7c346aa..0ec033733e 100644 --- a/scripts/core/menu/views/menu.html +++ b/scripts/core/menu/views/menu.html @@ -33,7 +33,7 @@

- + From 6109a40d7aa3a7f1a5411fd43e381d518c9e6ea4 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Mon, 18 Sep 2023 13:16:26 +0200 Subject: [PATCH 52/67] update e2e selector --- e2e/client/specs/helpers/tree-select-driver.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/e2e/client/specs/helpers/tree-select-driver.ts b/e2e/client/specs/helpers/tree-select-driver.ts index c2f4162070..aeeac91729 100644 --- a/e2e/client/specs/helpers/tree-select-driver.ts +++ b/e2e/client/specs/helpers/tree-select-driver.ts @@ -25,9 +25,7 @@ export class TreeSelectDriver { addValue(value: string): void { el(['open-popover'], null, this._element).click(); - const dropdown = element(by.id('TREESELECT_DROPDOWN')); - - dropdown.element(by.cssContainingText('[data-test-id="option"]', value)).click(); + element(by.cssContainingText('[data-test-id="tree-select-popover"] [data-test-id="option"]', value)).click(); } setValue(value: string) { From 1627ce3ee5bfb8b9b003569c98b2c2c00dc99deb Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Mon, 18 Sep 2023 13:26:33 +0200 Subject: [PATCH 53/67] update procedure to run e2e --- e2e/client/package.json | 2 +- e2e/client/run-end-to-end-tests.js | 46 ------------------------------ 2 files changed, 1 insertion(+), 47 deletions(-) delete mode 100644 e2e/client/run-end-to-end-tests.js diff --git a/e2e/client/package.json b/e2e/client/package.json index d363f7a7ff..f2684e333c 100644 --- a/e2e/client/package.json +++ b/e2e/client/package.json @@ -19,7 +19,7 @@ "server": "grunt server", "start-client-server": "http-server dist -p 9000 -s &", "stop-client-server": "fuser -k 9000/tcp", - "protractor": "node run-end-to-end-tests.js", + "protractor": "protractor protractor.conf.js", "specs--compile": "find ./specs/ -name '*.js' -type f -delete && tsc -p ./specs", "specs--watch": "find ./specs/ -name '*.js' -type f -delete && tsc -p ./specs -w", "start-test-server": "cd ../server && docker-compose build && docker-compose up -d", diff --git a/e2e/client/run-end-to-end-tests.js b/e2e/client/run-end-to-end-tests.js deleted file mode 100644 index f0045a7da1..0000000000 --- a/e2e/client/run-end-to-end-tests.js +++ /dev/null @@ -1,46 +0,0 @@ -const execSync = require('child_process').execSync; - -function ensurePackageInstalled() { - return new Promise((resolve, reject) => { - try { - require.resolve('webdriver-manager'); - resolve(); - } catch (_) { - reject('Package "webdriver-manager" was not found. Run `yarn install` to install all packages.'); - } - }); -} - -function installWebdriverDriver() { - return new Promise((resolve, reject) => { - try { - require.resolve('webdriver-manager/selenium/update-config.json'); - resolve(); - } catch (_) { - // driver not installed, installing: - - const version = execSync('$CHROME_BIN --product-version').toString(); - - if (version == null) { - return reject('To launch the test server a chrome based browser has to be installed and CHROME_BIN environment variable set.'); - } - - console.info('Installing webdriver...', version); - execSync(`npx webdriver-manager update --gecko false --standalone false --versions.chrome=${version}`); - - resolve(); - } - }); -} - -ensurePackageInstalled() - .then(installWebdriverDriver) - .then(() => { - const argumentsToForward = process.argv.slice(2).join(' '); - - execSync(`npx protractor protractor.conf.js ${argumentsToForward}`, {stdio: 'inherit'}); - }) - .catch((e) => { - console.error(e); - process.exitCode = 1; - }); \ No newline at end of file From 5006cc7768ef14b64d3c86cd549b02b091a02b5e Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Mon, 18 Sep 2023 13:29:04 +0200 Subject: [PATCH 54/67] superdesk-ui-framework@3.0.59 --- package-lock.json | 12 ++++++------ package.json | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 114e2c60d3..11151ddba4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16674,9 +16674,9 @@ } }, "superdesk-ui-framework": { - "version": "3.0.58", - "resolved": "https://registry.npmjs.org/superdesk-ui-framework/-/superdesk-ui-framework-3.0.58.tgz", - "integrity": "sha512-qFcACrkLhAz1h/qNqVR5To+CaEJ2SThtWojJTbjcOiRgR4MOgjgUaZy2xnUrtO+VO6RyeaggiT6yx6G+jRFuEA==", + "version": "3.0.59", + "resolved": "https://registry.npmjs.org/superdesk-ui-framework/-/superdesk-ui-framework-3.0.59.tgz", + "integrity": "sha512-FuXyJNGVE970jlHWm0vD1Cr9QGLEfjONPaPfNSAKQZHW1f//By2VERgPi8TFv1kTdZOlXcOP6vFhnw/OR/Z6Nw==", "requires": { "@material-ui/lab": "^4.0.0-alpha.56", "@popperjs/core": "^2.4.0", @@ -16699,9 +16699,9 @@ }, "dependencies": { "@types/node": { - "version": "14.18.59", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.59.tgz", - "integrity": "sha512-NWJMpBL2Xs3MY93yrD6YrrTKep8eIA6iMnfG4oIc6LrTRlBZgiSCGiY3V/Owlp6umIBLyKb4F8Q7hxWatjYH5A==" + "version": "14.18.61", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.61.tgz", + "integrity": "sha512-1mFT4DqS4/s9tlZbdkwEB/EnSykA9MDeDLIk3FHApGvIMGY//qgstB2gu9GKGESWyW/qiRUO+jhlLJ9bBJ8j+Q==" }, "cheerio": { "version": "1.0.0-rc.12", diff --git a/package.json b/package.json index 4d3c068d8e..b17d5fac21 100644 --- a/package.json +++ b/package.json @@ -122,7 +122,7 @@ "sass-loader": "6.0.6", "shortid": "2.2.8", "style-loader": "0.20.2", - "superdesk-ui-framework": "^3.0.58", + "superdesk-ui-framework": "^3.0.59", "ts-loader": "3.5.0", "tslint": "5.11.0", "typescript": "4.9.5", From d95ca720dcad1b3d5ae3b4853d9c4b8c0eef2904 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Mon, 18 Sep 2023 13:51:47 +0200 Subject: [PATCH 55/67] fix e2e Can create items from templates --- e2e/client/specs/monitoring_spec.ts | 14 ++++++++------ .../apps/templates/views/create-template.html | 16 ++++++++++++---- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/e2e/client/specs/monitoring_spec.ts b/e2e/client/specs/monitoring_spec.ts index fe2fee259c..7c1c0b220c 100644 --- a/e2e/client/specs/monitoring_spec.ts +++ b/e2e/client/specs/monitoring_spec.ts @@ -900,13 +900,10 @@ describe('monitoring', () => { browser.wait(ECE.invisibilityOf(previewPane)); }); - // disabled, because prepopulate script can't setup data - // for fake IDs to work, they have to be defined before usage - // and when template needs desk ID and desk needs template ID - there's no way to do it. - // TODO: reimplement when database snapshots are available - xit('Can create items from templates', () => { + it('Can create items from templates', () => { const slugline = 'slugline template'; const editorsNote = 'test editor\'s note for template'; + const newTemplateName = 'template 1234'; monitoring.openMonitoring(); expect(browser.isElementPresent(element(s(['authoring'])))).toBe(false); @@ -921,11 +918,16 @@ describe('monitoring', () => { el(['authoring', 'actions-button']).click(); el(['authoring', 'actions-list']).element(by.buttonText('Save as template')).click(); + + el(['save-as-template', 'name-input']).clear(); + el(['save-as-template', 'name-input']).sendKeys(newTemplateName); + el(['create-template-modal--save']).click(); + el(['authoring', 'close']).click(); expect(browser.isElementPresent(element(s(['authoring'])))).toBe(false); - authoring.createTextItemFromTemplate(slugline); + authoring.createTextItemFromTemplate(newTemplateName); browser.sleep(500); // animation expect(browser.isElementPresent(element(s(['authoring'])))).toBe(true); diff --git a/scripts/apps/templates/views/create-template.html b/scripts/apps/templates/views/create-template.html index 232b39819b..db74af19ee 100644 --- a/scripts/apps/templates/views/create-template.html +++ b/scripts/apps/templates/views/create-template.html @@ -5,12 +5,20 @@

Save as template

-
+
- +
Sorry, but template name must be unique.
It will update existing template. @@ -20,12 +28,12 @@

Save as template

-
+
Desk template
- +
From b4ae87c0f02f8c8b4b3b5aa4bb25831f2f863716 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Mon, 18 Sep 2023 16:53:30 +0200 Subject: [PATCH 56/67] fix e2e can filter content by content profile plain text profile was added --- e2e/client/specs/monitoring_spec.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/e2e/client/specs/monitoring_spec.ts b/e2e/client/specs/monitoring_spec.ts index 7c1c0b220c..5816c7167d 100644 --- a/e2e/client/specs/monitoring_spec.ts +++ b/e2e/client/specs/monitoring_spec.ts @@ -405,7 +405,7 @@ describe('monitoring', () => { authoring.close(); browser.wait(ECE.hasElementCount(els(['article-item']), 3), 2000); el(['content-profile-dropdown']).click(); - browser.wait(ECE.hasElementCount(els(['content-profiles']), 2)); + browser.wait(ECE.hasElementCount(els(['content-profiles']), 3)); el(['content-profile-dropdown'], by.buttonText('testing')).click(); browser.wait(ECE.hasElementCount(els(['article-item']), 1)); expect(monitoring.getTextItemBySlugline(0, 0)).toBe('TESTING1 SLUGLINE'); @@ -420,7 +420,7 @@ describe('monitoring', () => { expect(monitoring.getTextItem(4, 0)).toBe('item4'); el(['content-profile-dropdown']).click(); - browser.wait(ECE.hasElementCount(els(['content-profiles']), 2)); + browser.wait(ECE.hasElementCount(els(['content-profiles']), 3)); el(['content-profile-dropdown'], by.buttonText('testing')).click(); browser.wait(ECE.hasElementCount(els(['article-item']), 1), 2000); expect(monitoring.getTextItemBySlugline(0, 0)).toBe('TESTING1 SLUGLINE'); From b8b25d7e48b927c7143d635b6348b6f14918581e Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Mon, 18 Sep 2023 17:27:29 +0200 Subject: [PATCH 57/67] disable broken tests that are supposed to check for spelling mistakes before sending article to another desk --- e2e/client/specs/send_spec.ts | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/e2e/client/specs/send_spec.ts b/e2e/client/specs/send_spec.ts index ec4b569bc9..4bd82767e4 100644 --- a/e2e/client/specs/send_spec.ts +++ b/e2e/client/specs/send_spec.ts @@ -34,14 +34,28 @@ describe('send', () => { expect(getItemState(0)).toBe('SUBMITTED'); }); - it('warns that there are spelling mistakes', () => { + /** + * Not sure if this was ever testing the intended thing. + * Currently it is only passing by accident + * since there's a modal that prompts to save unsaved changes. + * It isn't testing anything related to spellchecking. + * I'm disabling it in case we wanted to reimplement it in the future. + */ + xit('warns that there are spelling mistakes', () => { workspace.editItem(1); authoring.writeText('mispeled word'); authoring.sendTo('Sports Desk'); expect(element(by.className('modal__content')).isDisplayed()).toBe(true); }); - it('can submit item to a desk although there are spelling mistakes', () => { + /** + * Not sure if this was ever testing the intended thing. + * Currently it is only passing by accident + * since there's a modal that prompts to save unsaved changes. + * It isn't testing anything related to spellchecking. + * I'm disabling it in case we wanted to reimplement it in the future. + */ + xit('can submit item to a desk although there are spelling mistakes', () => { workspace.editItem(1); authoring.writeText('mispeled word'); authoring.sendTo('Sports Desk'); @@ -57,7 +71,14 @@ describe('send', () => { expect(getItemState(0)).toBe('SUBMITTED'); }); - it('can cancel submit request because there are spelling mistakes', () => { + /** + * Not sure if this was ever testing the intended thing. + * Currently it is only passing by accident + * since there's a modal that prompts to save unsaved changes. + * It isn't testing anything related to spellchecking. + * I'm disabling it in case we wanted to reimplement it in the future. + */ + xit('can cancel submit request because there are spelling mistakes', () => { workspace.editItem(1); authoring.writeText('mispeled word'); authoring.sendTo('Sports Desk'); From fa8367e6f34af08a8784a9bf550f67487e578f48 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Mon, 18 Sep 2023 17:34:55 +0200 Subject: [PATCH 58/67] improve stability of e2e test (was unstable due to animation) displays custom text fields --- e2e/client/specs/content_profile_spec.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/e2e/client/specs/content_profile_spec.ts b/e2e/client/specs/content_profile_spec.ts index 10fe77122c..f52735ada0 100644 --- a/e2e/client/specs/content_profile_spec.ts +++ b/e2e/client/specs/content_profile_spec.ts @@ -7,6 +7,7 @@ import {workspace} from './helpers/workspace'; import {authoring} from './helpers/authoring'; import {metadata} from './helpers/metadata'; import {assertToastMsg} from './helpers/utils'; +import {ECE} from '@superdesk/end-to-end-testing-helpers'; describe('Content profiles', () => { it('creates corresponding template', () => { @@ -87,12 +88,12 @@ describe('Content profiles', () => { contentProfiles.editContentFields(); - const btns = element.all(by.partialButtonText(FIELD_LABEL)); + const buttons = element.all(by.partialButtonText(FIELD_LABEL)); - expect(btns.filter((elem) => elem.isDisplayed()).count()).toBe(0); + browser.wait(ECE.hasElementCount(buttons, 0)); contentProfiles.openAddFieldDropdown(); - expect(btns.filter((elem) => elem.isDisplayed()).count()).toBe(1); + browser.wait(ECE.hasElementCount(buttons, 1)); }); }); From 0fb695a2330d9f92cc980b9efc2eda1ef893a02d Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Tue, 19 Sep 2023 08:56:17 +0200 Subject: [PATCH 59/67] use default timeout --- e2e/client/specs/authoring_spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e/client/specs/authoring_spec.ts b/e2e/client/specs/authoring_spec.ts index 9467e4bf59..b4b5dcbe88 100644 --- a/e2e/client/specs/authoring_spec.ts +++ b/e2e/client/specs/authoring_spec.ts @@ -254,7 +254,7 @@ describe('authoring', () => { authoring.writeText('z'); element(by.cssContainingText('label', 'Dateline')).click(); ctrlShiftKey('s'); - browser.wait(() => element(by.buttonText('Save')).getAttribute('disabled'), 500); + browser.wait(() => element(by.buttonText('Save')).getAttribute('disabled')); authoring.close(); monitoring.actionOnItem('Edit', 2, 0); browser.sleep(300); From 2fe9056dcddd682bd7d66f5284d400a50be0d6bf Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Tue, 19 Sep 2023 09:14:14 +0200 Subject: [PATCH 60/67] make e2e test more stable by removing time based assumptions --- e2e/client/specs/authoring_spec.ts | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/e2e/client/specs/authoring_spec.ts b/e2e/client/specs/authoring_spec.ts index b4b5dcbe88..2c743e3f3c 100644 --- a/e2e/client/specs/authoring_spec.ts +++ b/e2e/client/specs/authoring_spec.ts @@ -324,16 +324,31 @@ describe('authoring', () => { it('toggle auto spellcheck and hold changes', () => { monitoring.actionOnItem('Edit', 2, 1); - browser.sleep(500); - expect(element(by.model('spellcheckMenu.isAuto')).getAttribute('checked')).toBeTruthy(); + + browser.wait(ECE.attributeEquals( + element(by.model('spellcheckMenu.isAuto')), + 'checked', + 'true', + )); + authoring.toggleAutoSpellCheck(); - browser.sleep(500); - expect(element(by.model('spellcheckMenu.isAuto')).getAttribute('checked')).toBeFalsy(); + + browser.wait(ECE.attributeEquals( + element(by.model('spellcheckMenu.isAuto')), + 'checked', + null, + )); + authoring.close(); + monitoring.actionOnItem('Edit', 2, 2); - expect(element(by.model('spellcheckMenu.isAuto')).getAttribute('checked')).toBeFalsy(); - }); + browser.wait(ECE.attributeEquals( + element(by.model('spellcheckMenu.isAuto')), + 'checked', + null, + )); + }); it('related item widget', () => { monitoring.actionOnItem('Edit', 2, 1); authoring.writeText('something'); From 796b873e268b79fc8b74b1896e2dfa5b9c1dcc8a Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Tue, 19 Sep 2023 09:31:43 +0200 Subject: [PATCH 61/67] increase timeout --- e2e/client/specs/helpers/monitoring.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e/client/specs/helpers/monitoring.ts b/e2e/client/specs/helpers/monitoring.ts index b0f0237814..4cd5f76cad 100644 --- a/e2e/client/specs/helpers/monitoring.ts +++ b/e2e/client/specs/helpers/monitoring.ts @@ -175,7 +175,7 @@ class Monitoring { const groups = element.all(by.repeater('group in aggregate.groups')); browser.sleep(3000); // due to debouncing, loading does not start immediately - browser.wait(ECE.hasElementCount(els(['item-list--loading']), 0), 2000); + browser.wait(ECE.hasElementCount(els(['item-list--loading']), 0), 3000); return groups; }; From f2c69eb5f21061b9e1691fef15245d0b147d9ddf Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Tue, 19 Sep 2023 09:43:25 +0200 Subject: [PATCH 62/67] stabilize e2e test by waiting for condition --- e2e/client/specs/monitoring_spec.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/e2e/client/specs/monitoring_spec.ts b/e2e/client/specs/monitoring_spec.ts index 5816c7167d..ece9da142e 100644 --- a/e2e/client/specs/monitoring_spec.ts +++ b/e2e/client/specs/monitoring_spec.ts @@ -774,7 +774,6 @@ describe('monitoring', () => { monitoring.saveSettings(); monitoring.openMonitoring(); - browser.sleep(3000); // wait for monitoring groups to load expect(monitoring.getTextItem(1, 2)).toBe('item6'); @@ -792,7 +791,8 @@ describe('monitoring', () => { monitoring.actionOnItemSubmenu('Publishing actions', 'Correct item', 0, 0); authoring.send_correction_button.click(); - expect(element(by.id('multi-select-count')).isPresent()).toBeFalsy(); + + browser.wait(ECE.stalenessOf(element(by.id('multi-select-count')))); }); it('can view published duplicated item in duplicate tab of non-published original item', () => { From efd80fedecb880fc61051665013edf2da8829a3e Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Tue, 19 Sep 2023 12:21:46 +0200 Subject: [PATCH 63/67] fix e2e test - use default wait can dynamically update items in related tab when item duplicated --- e2e/client/specs/helpers/search.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/e2e/client/specs/helpers/search.ts b/e2e/client/specs/helpers/search.ts index 08b972c092..2d3f392281 100644 --- a/e2e/client/specs/helpers/search.ts +++ b/e2e/client/specs/helpers/search.ts @@ -149,7 +149,8 @@ class GlobalSearch { itemElem.click(); - browser.wait(() => itemElem.getAttribute('class').then((classes) => classes.includes('active')), 500); + browser.wait(ECE.attributeContains(itemElem, 'class', 'active')); + browser.sleep(350); // there is timeout on click }; From 3281f890c99afa46ab309ca199d37ddf18865095 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Tue, 19 Sep 2023 20:09:23 +0200 Subject: [PATCH 64/67] use 2.7 server for e2e tests --- e2e/server/requirements.in | 2 +- e2e/server/requirements.txt | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/e2e/server/requirements.in b/e2e/server/requirements.in index 030e8729b6..9e53730db2 100644 --- a/e2e/server/requirements.in +++ b/e2e/server/requirements.in @@ -1,3 +1,3 @@ honcho gunicorn -git+https://github.com/tomaskikutis/superdesk-core.git@release/2.7-fix-e2e-data#egg=Superdesk-Core +git+https://github.com/superdesk/superdesk-core.git@release/2.7#egg=Superdesk-Core diff --git a/e2e/server/requirements.txt b/e2e/server/requirements.txt index 6a80c51669..c30d71eaab 100644 --- a/e2e/server/requirements.txt +++ b/e2e/server/requirements.txt @@ -26,9 +26,9 @@ blinker==1.4 # flask-mail # raven # superdesk-core -boto3==1.28.37 +boto3==1.28.50 # via superdesk-core -botocore==1.31.37 +botocore==1.31.50 # via # boto3 # s3transfer @@ -71,7 +71,7 @@ click-repl==0.3.0 # via celery croniter==0.3.37 # via superdesk-core -cryptography==41.0.3 +cryptography==41.0.4 # via # authlib # jwcrypto @@ -243,9 +243,9 @@ six==1.16.0 # flask-oidc-ex # oauth2client # python-dateutil -superdesk-core @ git+https://github.com/tomaskikutis/superdesk-core.git@release/2.7-fix-e2e-data +superdesk-core @ git+https://github.com/superdesk/superdesk-core.git@release/2.7 # via -r requirements.in -typing-extensions==4.7.1 +typing-extensions==4.8.0 # via superdesk-core tzlocal==2.1 # via superdesk-core From 2038decc98179720c0623ba35476c3361f93b473 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Tue, 19 Sep 2023 20:36:00 +0200 Subject: [PATCH 65/67] improve tree-select driver to allow selecting values across multiple levels --- e2e/client/specs/helpers/tree-select-driver.ts | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/e2e/client/specs/helpers/tree-select-driver.ts b/e2e/client/specs/helpers/tree-select-driver.ts index aeeac91729..d5fb74b211 100644 --- a/e2e/client/specs/helpers/tree-select-driver.ts +++ b/e2e/client/specs/helpers/tree-select-driver.ts @@ -22,13 +22,22 @@ export class TreeSelectDriver { }); } - addValue(value: string): void { + addValue(value: string | Array): void { el(['open-popover'], null, this._element).click(); - element(by.cssContainingText('[data-test-id="tree-select-popover"] [data-test-id="option"]', value)).click(); + const values = typeof value === 'string' ? [value] : value; + + for (let i = 0; i < values.length; i++) { + element( + by.cssContainingText( + '[data-test-id="tree-select-popover"] [data-test-id="option"]', + values[i], + ), + ).click(); + } } - setValue(value: string) { + setValue(value: string | Array) { const maybeClearButton = this._element.element(s(['clear-value'])); maybeClearButton.isPresent().then((present) => { From f6971887ced1f1a2b33c065a6a95a88b35fd0fd3 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Wed, 20 Sep 2023 09:20:02 +0200 Subject: [PATCH 66/67] improve unstable tests --- e2e/client/specs/authoring_spec.ts | 8 +++++++- e2e/client/specs/helpers/search.ts | 2 +- e2e/client/specs/search_spec.ts | 8 ++++++-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/e2e/client/specs/authoring_spec.ts b/e2e/client/specs/authoring_spec.ts index 2c743e3f3c..83dd4f3720 100644 --- a/e2e/client/specs/authoring_spec.ts +++ b/e2e/client/specs/authoring_spec.ts @@ -254,7 +254,13 @@ describe('authoring', () => { authoring.writeText('z'); element(by.cssContainingText('label', 'Dateline')).click(); ctrlShiftKey('s'); - browser.wait(() => element(by.buttonText('Save')).getAttribute('disabled')); + + browser.wait(ECE.attributeEquals( + element(by.buttonText('Save')), + 'disabled', + 'true', + )); + authoring.close(); monitoring.actionOnItem('Edit', 2, 0); browser.sleep(300); diff --git a/e2e/client/specs/helpers/search.ts b/e2e/client/specs/helpers/search.ts index 2d3f392281..ae0b6bfe16 100644 --- a/e2e/client/specs/helpers/search.ts +++ b/e2e/client/specs/helpers/search.ts @@ -182,7 +182,7 @@ class GlobalSearch { browser.sleep(100); const btn = itemElem.element(by.className('icn-btn')); - browser.wait(ECE.elementToBeClickable(btn), 1000); + browser.wait(ECE.elementToBeClickable(btn)); btn.click(); const menu = element(by.css('.dropdown__menu.open')); diff --git a/e2e/client/specs/search_spec.ts b/e2e/client/specs/search_spec.ts index c7b39b61d8..e89a122047 100644 --- a/e2e/client/specs/search_spec.ts +++ b/e2e/client/specs/search_spec.ts @@ -274,8 +274,12 @@ describe('search', () => { authoring.closeSendAndPublish(); authoring.save(); authoring.close(); - expect(globalSearch.getItem(0).element(by.className('state_embargo')).isDisplayed()).toBe(true); - expect(globalSearch.getItem(0).element(by.className('state_embargo')).getText()).toEqual('EMBARGO'); + + const embargoElement = globalSearch.getItem(0).element(by.className('state_embargo')); + + browser.wait(ECE.visibilityOf(embargoElement)); + + expect(embargoElement.getText()).toEqual('EMBARGO'); }); it('can search scheduled', () => { From 33ee04b9ff40829251169332b13c224ecc44d197 Mon Sep 17 00:00:00 2001 From: Tomas Kikutis Date: Wed, 20 Sep 2023 09:49:30 +0200 Subject: [PATCH 67/67] restore e2e test: can set embargo and send --- e2e/client/specs/content_spec.ts | 44 ++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/e2e/client/specs/content_spec.ts b/e2e/client/specs/content_spec.ts index e68dfc53ba..91c14a0026 100644 --- a/e2e/client/specs/content_spec.ts +++ b/e2e/client/specs/content_spec.ts @@ -7,6 +7,7 @@ import {content} from './helpers/content'; import {authoring} from './helpers/authoring'; import {multiAction} from './helpers/actions'; import {ECE, el} from '@superdesk/end-to-end-testing-helpers'; +import {TreeSelectDriver} from './helpers/tree-select-driver'; describe('content', () => { var body = element(by.tagName('body')); @@ -236,4 +237,47 @@ describe('content', () => { content.closePreview(); }); + + it('can set embargo and send', () => { + // Initial steps before proceeding, to get initial state of send buttons. + workspace.editItem('item3', 'SPORTS'); + authoring.sendTo('Sports Desk', 'Incoming Stage'); + authoring.confirmSendTo(); + + workspace.editItem('item3', 'SPORTS'); + + el(['open-send-publish-pane']).click(); + + el(['authoring', 'interactive-actions-panel', 'tabs'], by.buttonText('Send to')).click(); + + const sendToButton = el(['authoring', 'interactive-actions-panel', 'send']); + + browser.wait(ECE.visibilityOf(sendToButton)); + + new TreeSelectDriver( + el(['interactive-actions-panel', 'destination-select']), + ).setValue('Sports Desk'); + + const stage = 'two'; + + // State after selecting different Stage in the same desk + el( + ['interactive-actions-panel', 'stage-select'], + by.cssContainingText('[data-test-id="item"]', stage), + ).click(); + + expect(sendToButton.isEnabled()).toBe(true); + + // State after setting Embargo + setEmbargo(); + browser.sleep(100); + expect(sendToButton.isEnabled()).toBe(true); + + // State after changing Desk + new TreeSelectDriver( + el(['interactive-actions-panel', 'destination-select']), + ).setValue('Politic Desk'); + + expect(sendToButton.isEnabled()).toBe(true); + }); });