fix failing e2e

client/components/Contacts/ActionBar.tsx

@@ -0,0 +1,39 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import {gettext} from 'core/utils';
+
+export const ActionBar: React.FunctionComponent<any> = ({svc, readOnly, dirty, valid, onSave, onCancel}) => (
+    <div className="action-bar show">
+        <div className="button-group button-group--end button-group--comfort">
+            <button
+                id="cancel-edit-btn"
+                type="button"
+                className="btn"
+                onClick={onCancel}
+            >
+                {gettext('Cancel')}
+            </button>
+
+            {!readOnly && (
+                <button
+                    id="save-edit-btn"
+                    type="button"
+                    className="btn btn--primary"
+                    onClick={onSave}
+                    disabled={!valid || !dirty}
+                >
+                    {gettext('Save')}
+                </button>
+            )}
+        </div>
+    </div>
+);
+
+ActionBar.propTypes = {
+    svc: PropTypes.object.isRequired,
+    onSave: PropTypes.func,
+    onCancel: PropTypes.func,
+    readOnly: PropTypes.bool,
+    dirty: PropTypes.bool,
+    valid: PropTypes.bool,
+};

client/components/Contacts/ContactEditor/index.tsx

@@ -5,6 +5,7 @@ import {gettext} from '../../../utils';
 import * as ContactFormComponents from 'superdesk-core/scripts/apps/contacts/components/Form';
 import {IContact} from 'superdesk-core/scripts/apps/contacts/Contacts';
 import ng from 'superdesk-core/scripts/core/services/ng';
+import {ActionBar} from '../ActionBar';
 
 interface IProps {
     currentContact: IContact;
@@ -75,7 +76,7 @@ export class ContactEditor extends React.Component<IProps, IState> {
     }
 
     render() {
-        const {ContactFormContainer, ActionBar} = ContactFormComponents;
+        const {ContactFormContainer} = ContactFormComponents;
         const {currentContact} = this.props;
 
         // Provides required services for Contact components

e2e/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3.8"
-
 name: superdesk-planning-e2e
 
 services:
@@ -9,6 +7,8 @@ services:
             - discovery.type=single-node
         networks:
             - e2e
+        ports:
+            - "9200:9200"
         tmpfs:
             - /usr/share/elasticsearch/data
 
@@ -18,7 +18,7 @@ services:
             - e2e
 
     mongo:
-        image: mongo:4
+        image: mongo:6
         networks:
             - e2e
         tmpfs:

server/planning/common.py

@@ -856,7 +856,7 @@ def update_ingest_on_patch(updates: Dict[str, Any], original: Dict[str, Any]):
         # The local version has not been published yet
         # So remove the provided ``pubstatus``
         updates.pop("pubstatus", None)
-    elif original.get("pubstatus") == updates.get("ingest_pubstatus") or original.get("pubstatus"):
+    elif original.get("pubstatus") == updates.get("ingest_pubstatus"):
         # The local version has been published
         # and no change to ``pubstatus`` on ingested item
         updates.pop("state")

server/planning/events/events_schema.py

@@ -64,7 +64,7 @@
     "ingest_provider_sequence": metadata_schema["ingest_provider_sequence"],
     "ingest_firstcreated": metadata_schema["versioncreated"],
     "ingest_versioncreated": metadata_schema["versioncreated"],
-    "ingest_pubstatus": metadata_schema["pubstatus"],
+    "ingest_pubstatus": {"type": "string", "mapping": not_analyzed},
     "event_created": {"type": "datetime"},
     "event_lastmodified": {"type": "datetime"},
     # Event Details

server/planning/planning/planning.py

@@ -1814,7 +1814,7 @@ def _iter_recurring_plannings_to_update(self, updates, original, update_method):
     "ingest_provider_sequence": metadata_schema["ingest_provider_sequence"],
     "ingest_firstcreated": metadata_schema["versioncreated"],
     "ingest_versioncreated": metadata_schema["versioncreated"],
-    "ingest_pubstatus": metadata_schema["pubstatus"],
+    "ingest_pubstatus": {"type": "string", "mapping": not_analyzed},
     # Agenda Item details
     "agendas": {
         "type": "list",