fix media metadata editor changes not being saved

.eslintrc.js

@@ -44,6 +44,8 @@ module.exports = Object.assign({}, sharedConfigs, {
         '@typescript-eslint/ban-types': 'off',
         '@typescript-eslint/no-inferrable-types': 'off',
         '@typescript-eslint/no-this-alias': 'off',
+        '@typescript-eslint/no-explicit-any': 'off',
+        '@typescript-eslint/no-unused-vars': 'off',
     }),
     plugins: [...(sharedConfigs.plugins ?? []), '@typescript-eslint'],
 

.github/workflows/tests.yml

@@ -90,5 +90,5 @@ jobs:
 
     - name: Server Logs
       if: ${{ failure() }}
-      run: docker compose logs superdesk
+      run: docker compose logs server
       working-directory: e2e/server

e2e/client/playwright/authoring.picture.spec.ts

@@ -0,0 +1,50 @@
+import {test, expect} from '@playwright/test';
+import {Monitoring} from './page-object-models/monitoring';
+import {restoreDatabaseSnapshot} from './utils';
+import {MediaEditor} from './page-object-models/media-editor';
+import {PictureAuthoring} from './page-object-models/authoring';
+
+test.setTimeout(30000);
+
+/**
+ * upload a picture
+ * edit metadata
+ * test metadata changes from modal are visible in the editor
+ */
+test('media metadata editor', async ({page}) => {
+    await restoreDatabaseSnapshot();
+
+    const monitoring = new Monitoring(page);
+    const mediaEditor = new MediaEditor(page);
+    const pictureAuthoring = new PictureAuthoring(page);
+
+    await page.goto('/#/workspace/monitoring');
+
+    await monitoring.selectDeskOrWorkspace('Sports');
+
+    await monitoring.uploadMedia();
+
+    await mediaEditor.selectUploadFile('iptc-photo.jpg');
+
+    await expect(mediaEditor.field('headline')).toContainText('The Headline');
+
+    await mediaEditor.field('headline').clear();
+    await mediaEditor.field('headline').fill('picture');
+
+    await mediaEditor.startUpload();
+
+    await monitoring.executeActionOnMonitoringItem(monitoring.listArticle('picture'), 'Edit');
+
+    await pictureAuthoring.openMetadataEditor();
+
+    await mediaEditor.field('description_text').fill('test description');
+    await mediaEditor.saveMetadata();
+
+    await expect(pictureAuthoring.field('description_text')).toContainText('test description');
+
+    await pictureAuthoring.field('description_text').fill('new description');
+
+    await pictureAuthoring.openMetadataEditor();
+
+    await expect(mediaEditor.field('description_text')).toContainText('new description');
+});

e2e/client/playwright/page-object-models/authoring.ts

@@ -2,7 +2,7 @@ import {Page} from '@playwright/test';
 import {s} from '../utils';
 
 export class Authoring {
-    private page: Page;
+    protected page: Page;
 
     constructor(page: Page) {
         this.page = page;
@@ -21,4 +21,15 @@ export class Authoring {
             .getByRole('button', {name: actionPath[actionPath.length - 1]})
             .click();
     }
+
+    field(field: string) {
+        return this.page.locator(s('authoring', 'field--' + field)).getByRole('textbox');
+    }
 }
+
+export class PictureAuthoring extends Authoring {
+    async openMetadataEditor() {
+        await this.page.locator(s('authoring-field=media', 'image-overlay')).hover();
+        await this.page.locator(s('authoring-field=media', 'edit-metadata')).click();
+    }
+}

e2e/client/playwright/page-object-models/media-editor.ts

@@ -0,0 +1,29 @@
+import {Page} from '@playwright/test';
+import {s} from '../utils';
+import path from 'path';
+
+export class MediaEditor {
+    private page: Page;
+
+    constructor(page: Page) {
+        this.page = page;
+    }
+
+    field(field: string) {
+        return this.page.locator(s('media-metadata-editor', 'field--' + field)).getByRole('textbox');
+    }
+
+    async saveMetadata() {
+        await this.page.locator(s('apply-metadata-button')).click();
+        await this.page.locator(s('done')).click();
+    }
+
+    async selectUploadFile(fileName: string) {
+        await this.page.getByRole('button', {name: 'Select them from folder'}).click();
+        await this.page.locator(s('image-upload-input')).setInputFiles(path.join('test-files', fileName));
+    }
+
+    async startUpload() {
+        await this.page.locator(s('multi-image-edit--start-upload')).click();
+    }
+}

e2e/client/playwright/page-object-models/monitoring.ts

@@ -60,4 +60,13 @@ export class Monitoring {
             }
         }
     }
+
+    async uploadMedia(): Promise<void> {
+        await this.page.locator(s('content-create')).click();
+        await this.page.locator(s('content-create-dropdown')).getByRole('button', {name: 'Upload media'}).click();
+    }
+
+    listArticle(headline: string) {
+        return this.page.locator(s('article-item=' + headline));
+    }
 }

e2e/client/specs/authoring_spec.ts

@@ -29,14 +29,7 @@ function uploadMedia(imagePathAbsolute) {
     el(['media-metadata-editor', 'field--headline'], by.tagName('[contenteditable]'))
         .sendKeys('image headline');
     el(['media-metadata-editor', 'field--slugline'], by.tagName('[contenteditable]'))
-        .sendKeys('image headline');
-    el(['media-metadata-editor', 'field--alt_text'], by.tagName('[contenteditable]'))
-        .sendKeys('image alt text');
-
-    selectFromMetaTermsDropdown('anpa_category', ['Finance']);
-
-    selectFromMetaTermsDropdown('subject', ['arts, culture and entertainment', 'archaeology']);
-
+        .sendKeys('image slugline');
     el(['media-metadata-editor', 'field--description_text'], by.tagName('[contenteditable]'))
         .sendKeys('image description');
 

e2e/server/docker-compose.yml

@@ -1,3 +1,4 @@
+name: superdesk-client-core_e2e
 version: "3.2"
 services:
     redis:
@@ -22,7 +23,7 @@ services:
         command: --replSet rs0
 
     elastic:
-        image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.2
+        image: docker.elastic.co/elasticsearch/elasticsearch:7.17.22
         ports:
             - "9200:9200"
         networks:
@@ -33,7 +34,7 @@ services:
         tmpfs:
             - /usr/share/elasticsearch/data
 
-    superdesk:
+    server:
         build: .
         ports:
             - "5000:5000"

e2e/server/settings.py

@@ -27,3 +27,21 @@
 LEGAL_ARCHIVE = True
 
 DEFAULT_TIMEZONE = "Europe/London"
+
+VALIDATOR_MEDIA_METADATA = {
+    "slugline": {
+        "required": False,
+    },
+    "headline": {
+        "required": False,
+    },
+    "description_text": {
+        "required": True,
+    },
+    "byline": {
+        "required": False,
+    },
+    "copyrightnotice": {
+        "required": False,
+    },
+}

scripts/apps/archive/views/upload.html

@@ -35,7 +35,7 @@
                 <div class="upload__info-icon"></div>
                 <h3 class="upload__info-heading" translate>Drag Your Files Here</h3>
                 <div class="upload__info-label" translate>or</div>
-                <button ng-click="invokeImagesInput()" class="btn btn--hollow upload__info-button" translate>Select them from folder</button>
+                <button ng-click="invokeImagesInput()" data-test-id="select-file-btn" class="btn btn--hollow upload__info-button" translate>Select them from folder</button>
                 <input ng-if="uniqueUpload" id="images-input" type="file" ngf-select="addFiles($files)" class="hide" data-test-id="image-upload-input">
                 <input ng-if="!uniqueUpload" id="images-input" type="file" ngf-select="addFiles($files)" multiple class="hide" data-test-id="image-upload-input">
             </div>

scripts/apps/authoring/authoring/directives/ArticleEditDirective.ts

@@ -37,6 +37,7 @@ interface IScope extends ng.IScope {
     extra: any;
     refreshTrigger: number;
     autosave(item: any): any;
+    generateHtml(): void;
     modifySignOff(item: any): void;
     updateDateline(item: any, city: any): void;
     resetNumberOfDays(dateline: any, datelineMonth?: any): void;
@@ -342,6 +343,10 @@ export function ArticleEditDirective(
                  * @description Opens the Change Image Controller to modify the image metadata.
                  */
                 scope.editMedia = (defaultTab = 'view') => {
+                    // generate html before opening the modal to make
+                    // any changes done in the authoring visible there
+                    scope.generateHtml();
+
                     let showTabs = [];
 
                     scope.mediaLoading = true;
@@ -388,7 +393,7 @@ export function ArticleEditDirective(
                                     scope.articleEdit.$setDirty();
                                 }
                             } else {
-                                scope.save();
+                                scope.save({generateHtml: false});
                             }
                         })
                         .finally(() => {

scripts/apps/authoring/authoring/directives/AuthoringDirective.ts

@@ -95,12 +95,9 @@ export function AuthoringDirective(
             $scope.tabsPinned = false;
 
             var _closing;
-            var mediaFields = {};
             var userDesks;
 
             const UNIQUE_NAME_ERROR = gettext('Error: Unique Name is not unique.');
-            const MEDIA_TYPES = ['video', 'picture', 'audio'];
-            const isPersonalSpace = $location.path() === '/workspace/personal';
 
             $scope.eventListenersToRemoveOnUnmount = [];
             $scope.toDeskEnabled = false; // Send an Item to a desk
@@ -187,7 +184,7 @@ export function AuthoringDirective(
             function getCurrentTemplate() {
                 const item: IArticle | null = $scope.item;
 
-                if (item.type === 'composite') {
+                if (item.type !== 'text') {
                     $scope.currentTemplate = {};
                 } else {
                     if (typeof item?.template !== 'string') {
@@ -270,11 +267,11 @@ export function AuthoringDirective(
             /**
              * Create a new version
              */
-            $scope.save = function() {
+            $scope.save = function({generateHtml = true} = {}) {
                 return authoring.save(
                     $scope.origItem,
                     $scope.item,
-                    $scope.requestEditor3DirectivesToGenerateHtml,
+                    generateHtml ? $scope.requestEditor3DirectivesToGenerateHtml : [],
                 ).then((res) => {
                     $scope.dirty = false;
                     _.merge($scope.item, res);
@@ -557,9 +554,7 @@ export function AuthoringDirective(
                     // delay required for loading state to render
                     // before possibly long operation (with huge articles)
                     setTimeout(() => {
-                        for (const fn of $scope.requestEditor3DirectivesToGenerateHtml) {
-                            fn();
-                        }
+                        $scope.generateHtml();
 
                         resolve();
                     });
@@ -676,9 +671,7 @@ export function AuthoringDirective(
                 _closing = true;
 
                 // Request to generate html before we pass scope variables
-                for (const fn of ($scope.requestEditor3DirectivesToGenerateHtml ?? [])) {
-                    fn();
-                }
+                $scope.generateHtml();
 
                 // returned promise used by superdesk-fi
                 return authoringApiCommon.closeAuthoringStep2($scope, $rootScope);
@@ -859,7 +852,7 @@ export function AuthoringDirective(
             $scope.firstLineConfig.wordCount = $scope.firstLineConfig.wordCount ?? true;
 
             const _autosave = debounce((timeout) => {
-                $scope.requestEditor3DirectivesToGenerateHtml.forEach((fn) => fn());
+                $scope.generateHtml();
 
                 return authoring.autosave(
                     $scope.item,
@@ -882,6 +875,10 @@ export function AuthoringDirective(
                 _autosave(timeout);
             };
 
+            $scope.generateHtml = () => {
+                $scope.requestEditor3DirectivesToGenerateHtml.forEach((fn) => fn());
+            };
+
             $scope.sendToNextStage = function() {
                 sdApi.article.sendItemToNextStage($scope.item).then(() => {
                     $scope.$applyAsync();

scripts/apps/authoring/views/article-edit.html

@@ -279,18 +279,20 @@
      sd-validation-error="error.media"
      data-required="schema.media.required"
      tabindex="{{editor.media.order}}"
-     sd-width="{{editor.media.sdWidth|| 'full'}}">
-
+     sd-width="{{editor.media.sdWidth|| 'full'}}"
+     data-test-id="authoring-field"
+     data-test-value="media"
+>
     <div ng-if="item.type == 'picture' || item.type == 'graphic'" class="full-preview" sd-ratio-calc>
         <div class="media-item__item">
             <div class="item-association item-association--preview">
                 <div class="item-association__image-container" sd-item-rendition data-item="item" data-rendition="baseImage"></div>
 
-                <div class="item-association__image-overlay" ng-if="_editable">
-                    <div class="item-association__icons-block">
-                        <a class="item-association__image-action" sd-tooltip="{{'Edit metadata' | translate}}" ng-click="editMedia('view')" aria-label="{{ 'Edit metadata' | translate}}"><i class="icon-pencil"></i></a>
-                        <a class="item-association__image-action" sd-tooltip="{{'Edit image' | translate}}" ng-click="editMedia('image-edit')" aria-label="{{ 'Edit image' | translate}}"><i class="icon-switches"></i></a>
-                        <a class="item-association__image-action" sd-tooltip="{{'Edit crops' | translate}}" ng-click="editMedia('crop')" ng-if="metadata.crop_sizes" aria-label="{{ 'Edit crops' | translate}}"><i class="icon-crop"></i></a>
+                <div class="item-association__image-overlay" ng-if="_editable" data-test-id="image-overlay">
+                    <div class="item-association__icons-block" data-test-id="image-overlay-actions">
+                        <a class="item-association__image-action" data-test-id="edit-metadata" sd-tooltip="{{'Edit metadata' | translate}}" ng-click="editMedia('view')" aria-label="{{ 'Edit metadata' | translate}}"><i class="icon-pencil"></i></a>
+                        <a class="item-association__image-action" data-test-id="edit-image" sd-tooltip="{{'Edit image' | translate}}" ng-click="editMedia('image-edit')" aria-label="{{ 'Edit image' | translate}}"><i class="icon-switches"></i></a>
+                        <a class="item-association__image-action" data-test-id="crop" sd-tooltip="{{'Edit crops' | translate}}" ng-click="editMedia('crop')" ng-if="metadata.crop_sizes" aria-label="{{ 'Edit crops' | translate}}"><i class="icon-crop"></i></a>
                     </div>
                 </div>
             </div>
@@ -371,6 +373,7 @@
          data-required="schema.description_text.required"
          data-validation-error="error.description_text"
          data-validate-characters="schema.description_text.validate_characters"
+         data-test-id="field--description_text"
     ></div>
 </div>
 

scripts/apps/authoring/views/change-image.html

@@ -160,7 +160,7 @@ <h3 class="sd-slide-in-panel__heading" ng-if="nav === 'image-edit'" translate>Co
                         <div class="modal__sliding-toolbar" ng-if="metadata.isDirty">
                             <div class="sliding-toolbar__inner"></div>
                             <a class="btn" ng-click="cancelMetadataChanges()" translate>Cancel</a>
-                            <a class="btn btn--primary" ng-click="applyMetadataChanges()" translate>Apply</a>
+                            <a class="btn btn--primary" data-test-id="apply-metadata-button" ng-click="applyMetadataChanges()" translate>Apply</a>
                         </div>
 
                         <div sd-media-metadata-editor