fix duplicated items in saved search on desk

.github/workflows/tests.yml

@@ -61,12 +61,10 @@ jobs:
       run: npx playwright test
       working-directory: e2e/client
 
-    - uses: actions/upload-artifact@v3
-      if: always()
+    - uses: actions/upload-artifact@v4
       with:
-        name: playwright-report
-        path: e2e/client/playwright-report/
-        retention-days: 30
+        name: playwright-report-${{ matrix.suite }}
+        path: e2e/client/test-results
 
     # playwright end
 

e2e/client/playwright.config.ts

@@ -13,7 +13,7 @@ import path from 'path';
 export default defineConfig({
     testDir: './playwright',
     /* Run tests in files in parallel */
-    fullyParallel: true,
+    fullyParallel: false,
     /* Fail the build on CI if you accidentally left test.only in the source code. */
     forbidOnly: !!process.env.CI,
     /* Retry on CI only */

e2e/client/specs/helpers/templates.ts

@@ -1,8 +1,9 @@
 /* eslint-disable newline-per-chained-call */
 
 import {nav} from './utils';
-import {element, by, browser} from 'protractor';
+import {element, by, browser, ElementFinder} from 'protractor';
 import {el} from '@superdesk/end-to-end-testing-helpers';
+import {waitAndClick} from '../utils';
 
 class Templates {
     list: any;
@@ -11,7 +12,7 @@ class Templates {
     openTemplatesSettings: () => void;
     add: () => void;
     getTemplateNameElement: any;
-    getLegalSwitch: any;
+    legalSwitch: ElementFinder;
     getTemplateType: any;
     setTemplateType: (templateType: any) => void;
     getContentProfile: any;
@@ -75,7 +76,7 @@ class Templates {
          * Get the legal switch element
          * @returns {ElementFinder} legal switch element
          **/
-        this.getLegalSwitch = () => element(by.model('item.flags.marked_for_legal'));
+        this.legalSwitch = element(by.model('item.flags.marked_for_legal'));
 
         /**
          * Get the template type element
@@ -137,7 +138,7 @@ class Templates {
         /**
          * Toggles legal switch
          **/
-        this.toggleLegal = () => this.getLegalSwitch().click();
+        this.toggleLegal = () => waitAndClick(this.legalSwitch);
 
         /**
          * Toggle automatic item creation

e2e/client/specs/templates_spec.ts

@@ -35,7 +35,7 @@ describe('templates', () => {
         expect(templates.getListCount()).toBeGreaterThan(2);
         templates.edit('New Template');
         templates.toggleMetadata();
-        expect(templates.getLegalSwitch().getAttribute('checked')).toEqual('true');
+        expect(templates.legalSwitch.getAttribute('checked')).toEqual('true');
         expect(authoring.getHeadlineText()).toEqual('New Item');
         expect(authoring.getBodyText()).toEqual('This is body from the template');
         expect(authoring.getSignoffText()).toBe('ABC');

e2e/client/specs/utils.ts

@@ -1,3 +1,5 @@
+import {ElementFinder, browser, ExpectedConditions as EC} from 'protractor';
+
 // tslint:disable-next-line: no-var-requires
 var path = require('path');
 
@@ -6,3 +8,8 @@ export function getAbsoluteFilePath(
 ) {
     return path.join(__dirname, `../${relativePath}`);
 }
+
+export function waitAndClick(element: ElementFinder) {
+    browser.wait(EC.elementToBeClickable(element), 1000);
+    element.click();
+}

scripts/apps/monitoring/services/CardsService.ts

@@ -186,10 +186,6 @@ export function CardsService(search, session, desks, $location) {
                 query.filter({bool: {must}});
             }
         }
-
-        if (appConfig.features.nestedItemsInOutputStage) {
-            query.setOption('hidePreviousVersions', true);
-        }
     }
 
     function filterQueryByCardFileType(query, card: ICard) {
@@ -265,6 +261,10 @@ export function CardsService(search, session, desks, $location) {
             criteria.es_highlight = search.getElasticHighlight();
         }
 
+        if (appConfig.features.nestedItemsInOutputStage) {
+            query.setOption('hidePreviousVersions', true);
+        }
+
         criteria.source = query.getCriteria();
         if (card.type === 'search' && card.search && card.search.filter.query.repo) {
             criteria.repo = card.search.filter.query.repo;