Merge branch 'develop' into templates-e2e-test

dzonidoo · Apr 29, 2024 · 70d6dde · 70d6dde
2 parents ed92241 + ba2f125
commit 70d6dde
Show file tree

Hide file tree

Showing 38 changed files with 203 additions and 123 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -9,3 +9,11 @@ updates:
     directory: "/" # Location of package manifests
     schedule:
       interval: "daily"
+  - package-ecosystem: "npm" # See documentation for possible values
+    directory: "/e2e/client" # Location of package manifests
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "pip" # See documentation for possible values
+    directory: "/e2e/server" # Location of package manifests
+    schedule:
+      interval: "weekly"
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -73,7 +73,7 @@ jobs:
     # protractor start
 
     - name: Protractor
-      run: ./node_modules/.bin/protractor protractor.conf.js --suite=${{ matrix.suite }}
+      run: npx protractor-flake --parser standard  --max-attempts=3 -- protractor.conf.js --suite=${{ matrix.suite }}
       env:
         TRAVIS: ci
         SCREENSHOTS_DIR: /tmp

diff --git a/e2e/client/package.json b/e2e/client/package.json
@@ -8,11 +8,12 @@
     "@superdesk/build-tools": "file:../../build-tools",
     "@superdesk/end-to-end-testing-helpers": "1.0.11",
     "@types/node": "^20.8.9",
-    "btoa": "1.1.2",
+    "btoa": "1.2.1",
     "grunt": "1.3.0",
-    "http-server": "0.12.1",
-    "jasmine-reporters": "2.3.0",
+    "http-server": "14.1.1",
+    "jasmine-reporters": "2.5.2",
     "protractor": "7.0.0",
+    "protractor-flake": "4.0.0",
     "typescript": "4.9.3",
     "webdriver-manager": "^12.1.9"
   },

diff --git a/e2e/client/test-results/user-management-creating-a-new-user-chromium/trace.zip b/e2e/client/test-results/user-management-creating-a-new-user-chromium/trace.zip
diff --git a/e2e/client/test-results/user-profile-switching-system-language-chromium/trace.zip b/e2e/client/test-results/user-profile-switching-system-language-chromium/trace.zip
diff --git a/e2e/server/Dockerfile b/e2e/server/Dockerfile
@@ -1,14 +1,38 @@
-FROM python:3.10
+FROM ubuntu:22.04
 
-ADD requirements.txt .
-RUN pip3 install -U pip wheel setuptools
-RUN pip3 install -r requirements.txt
+ENV DEBIAN_FRONTEND=noninteractive
 
-WORKDIR /opt/superdesk
-COPY . /opt/superdesk
+RUN apt-get update && apt-get install -y --no-install-recommends \
+python3 python3-dev python3-pip python3-venv git gcc curl \
+# lxml
+libxml2-dev libxslt-dev \
+# xmlsec
+pkg-config libxml2-dev libxmlsec1-dev libxmlsec1-openssl \
+# PIL
+libjpeg-dev zlib1g-dev \
+# magic
+libmagic-dev \
+&& rm -rf /var/lib/apt/lists/*
 
-EXPOSE 5000
-EXPOSE 5100
+# setup venv
+ENV VIRTUAL_ENV=/opt/venv
+RUN python3 -m venv "$VIRTUAL_ENV"
+ENV PATH="$VIRTUAL_ENV/bin:$PATH"
+
+# update venv
+RUN python3 -m pip install -U pip wheel setuptools
+
+# install server
+WORKDIR /opt/superdesk/
+COPY requirements.txt .
+RUN python3 -m pip install -Ur requirements.txt
+
+ENV PYTHONUNBUFFERED=1
+ENV C_FORCE_ROOT=False
+ENV CELERYBEAT_SCHEDULE_FILENAME=/tmp/celerybeatschedule.db
+ENV TZ=Europe/Prague
+
+COPY . .
 
 ENTRYPOINT ["honcho"]
 CMD ["start"]
diff --git a/e2e/server/requirements.txt b/e2e/server/requirements.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.10
+# This file is autogenerated by pip-compile with Python 3.8
 # by the following command:
 #
 #    pip-compile requirements.in
@@ -110,7 +110,7 @@ flask-script==2.0.6
     # via superdesk-core
 future==1.0.0
     # via python-twitter
-gunicorn==21.2.0
+gunicorn==22.0.0
     # via -r requirements.in
 hachoir==3.0a3
     # via superdesk-core
@@ -205,6 +205,7 @@ python-twitter==3.5
     # via superdesk-core
 pytz==2024.1
     # via
+    #   babel
     #   celery
     #   eve-elastic
     #   flask-babel

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "superdesk-core",
-  "version": "2.6.2",
+  "version": "2.7.0-rc3",
   "license": "AGPL-3.0",
   "repository": {
     "type": "git",
@@ -46,10 +46,10 @@
     "angular-embed": "github:superdesk/angular-embed#d75968e",
     "angular-embedly": "github:superdesk/angular-embedly#master",
     "angular-gettext": "github:superdesk/angular-gettext#master",
-    "angular-i18n": "1.6.9",
+    "angular-i18n": "1.8.3",
     "angular-mocks": "1.6.9",
     "angular-moment": "1.2.0",
-    "angular-resource": "1.6.9",
+    "angular-resource": "1.8.3",
     "angular-route": "1.6.9",
     "angular-vs-repeat": "1.1.7",
     "bootstrap": "3.3.7",
@@ -92,7 +92,7 @@
     "load-grunt-tasks": "3.5.2",
     "lodash": "4.17.19",
     "ment.io": "0.9.23",
-    "moment": "2.29.4",
+    "moment": "2.30.1",
     "moment-timezone": "0.5.41",
     "ng-file-upload": "12.2.13",
     "node-sass": "4.14.0",
@@ -116,13 +116,13 @@
     "react-sortable-hoc": "1.11.0",
     "react-textarea-autosize": "5.2.1",
     "react-virtual": "2.10.4",
-    "redux": "4.0.5",
-    "redux-logger": "3.0.6",
-    "redux-thunk": "2.3.0",
+    "redux": "^4.2.1",
+    "redux-logger": "^3.0.6",
+    "redux-thunk": "^2.3.0",
     "sass-loader": "6.0.6",
     "shortid": "2.2.8",
     "style-loader": "0.20.2",
-    "superdesk-ui-framework": "^3.0.82",
+    "superdesk-ui-framework": "^3.1.3",
     "ts-loader": "3.5.0",
     "typescript": "4.9.5",
     "uuid": "8.3.1",
@@ -153,7 +153,7 @@
     "typescript-eslint-parser": "^18.0.0"
   },
   "resolutions": {
-    "moment": "2.29.4"
+    "moment": "2.30.1"
   },
   "scripts": {
     "gettext-extract": "grunt gettext:extract",

diff --git a/scripts/apps/authoring-react/article-widgets/versions-and-item-history/versions-tab.tsx b/scripts/apps/authoring-react/article-widgets/versions-and-item-history/versions-tab.tsx
@@ -255,6 +255,7 @@ export class VersionsTab extends React.PureComponent<IProps, IState> {
                                                 text={gettext('Preview')}
                                                 onClick={() => {
                                                     previewAuthoringEntity(
+                                                        item,
                                                         contentProfile,
                                                         fieldsData,
                                                         gettext('version {{n}}', {n: item._current_version}),

diff --git a/scripts/apps/authoring-react/authoring-react.tsx b/scripts/apps/authoring-react/authoring-react.tsx
@@ -1257,6 +1257,7 @@ export class AuthoringReact<T extends IBaseRestApiResponse> extends React.PureCo
         const printPreviewAction = (() => {
             const execute = () => {
                 previewAuthoringEntity(
+                    state.itemWithChanges,
                     state.profile,
                     state.fieldsDataWithChanges,
                 );

diff --git a/scripts/apps/authoring-react/authoring-section/authoring-section-field.tsx b/scripts/apps/authoring-react/authoring-section/authoring-section-field.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import {IAuthoringFieldV2, IAuthoringSectionTheme, IFieldsData} from 'superdesk-api';
+import {IAuthoringFieldV2, IAuthoringSectionTheme, IAuthoringSectionClassNames, IFieldsData} from 'superdesk-api';
 import {getField} from 'apps/fields';
 import {getFieldContainer} from './get-field-container';
 import {IPropsAuthoringSection} from './authoring-section';

diff --git a/scripts/apps/authoring-react/authoring-section/authoring-section.tsx b/scripts/apps/authoring-react/authoring-section/authoring-section.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import {IAuthoringSectionTheme, IFieldsV2, IVocabularyItem} from 'superdesk-api';
+import {IAuthoringSectionTheme, IAuthoringSectionClassNames, IFieldsV2, IVocabularyItem} from 'superdesk-api';
 import {Map} from 'immutable';
 import {IAuthoringValidationErrors, IToggledFields} from '../authoring-react';
 import {AuthoringSectionField} from './authoring-section-field';

diff --git a/scripts/apps/authoring-react/authoring-section/get-field-container.tsx b/scripts/apps/authoring-react/authoring-section/get-field-container.tsx
@@ -26,10 +26,10 @@ export function getFieldContainer(
 
     class HeaderLayout extends React.PureComponent<IEditorComponentContainerProps> {
         render() {
-            const {miniToolbar} = this.props;
+            const {miniToolbar, sectionClassNames} = this.props;
 
             return (
-                <div>
+                <div className={sectionClassNames?.header}>
                     <div
                         style={{
                             display: 'flex',
@@ -87,10 +87,10 @@ export function getFieldContainer(
 
     class ContentLayout extends React.PureComponent<IEditorComponentContainerProps> {
         render() {
-            const {miniToolbar} = this.props;
+            const {miniToolbar, sectionClassNames} = this.props;
 
             return (
-                <div>
+                <div className={sectionClassNames?.content}>
                     <div
                         style={{
                             display: 'flex',

diff --git a/scripts/apps/authoring-react/compare-articles/compare-articles.tsx b/scripts/apps/authoring-react/compare-articles/compare-articles.tsx
@@ -169,6 +169,7 @@ export class CompareAuthoringEntities<T> extends React.PureComponent<IProps<T>,
                                 primaryColumnShown && (
                                     <div style={scrollableColumnCss}>
                                         <PreviewAuthoringItem
+                                            item={entity1}
                                             profile={profile1}
                                             fieldsData={fieldsData1}
                                             fieldPadding={fieldPadding}
@@ -181,6 +182,7 @@ export class CompareAuthoringEntities<T> extends React.PureComponent<IProps<T>,
                                 secondaryColumnShown && (
                                     <div style={scrollableColumnCss}>
                                         <PreviewAuthoringItem
+                                            item={entity2}
                                             profile={profile2}
                                             fieldsData={fieldsData2}
                                             fieldPadding={fieldPadding}
@@ -197,6 +199,8 @@ export class CompareAuthoringEntities<T> extends React.PureComponent<IProps<T>,
                                             profile2={profile2}
                                             fieldsData1={fieldsData1}
                                             fieldsData2={fieldsData2}
+                                            item1={entity1}
+                                            item2={entity2}
                                             fieldPadding={fieldPadding}
                                         />
                                     </div>

diff --git a/scripts/apps/authoring-react/compare-articles/view-difference.tsx b/scripts/apps/authoring-react/compare-articles/view-difference.tsx
@@ -11,6 +11,8 @@ interface IProps {
     profile2: IContentProfileV2;
     fieldsData1: Map<string, any>;
     fieldsData2: Map<string, any>;
+    item1: any;
+    item2: any;
     fieldPadding: number;
     gapBetweenFields?: IPropsSpacer['gap'];
 }
@@ -82,6 +84,7 @@ export class ViewDifference extends React.PureComponent<IProps> {
 
                                         <div>
                                             <FieldEditorConfig.previewComponent
+                                                item={this.props.item2}
                                                 value={fieldsData2.get(field.id)}
                                                 config={field.fieldConfig}
                                             />
@@ -104,6 +107,7 @@ export class ViewDifference extends React.PureComponent<IProps> {
 
                                     <div>
                                         <FieldEditorConfig.previewComponent
+                                            item={this.props.item2}
                                             value={fieldsData2.get(field.id)}
                                             config={field.fieldConfig}
                                         />
@@ -131,6 +135,7 @@ export class ViewDifference extends React.PureComponent<IProps> {
 
                                 <div>
                                     <FieldEditorConfig.previewComponent
+                                        item={this.props.item1}
                                         value={fieldsData1.get(field.id)}
                                         config={field.fieldConfig}
                                     />