Merge remote-tracking branch 'origin/release/2.8' into develop

superdesk · Dec 18, 2024 · faa2c07 · faa2c07
2 parents d5f9dd4 + a26947d
commit faa2c07
Show file tree

Hide file tree

Showing 6 changed files with 140 additions and 105 deletions.
diff --git a/client/components/AddToPlanningModal/index.tsx b/client/components/AddToPlanningModal/index.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import {connect} from 'react-redux';
 
-import {Modal} from '../index';
+import {Modal} from 'superdesk-ui-framework/react';
 import {Button} from '../UI';
 import {AddToPlanningApp} from '../../apps';
 
@@ -55,39 +55,30 @@ export class AddToPlanningComponent extends React.Component {
 
         return (
             <Modal
-                show={true}
-                onHide={handleHide}
-                fill={true}
-            >
-                <Modal.Header>
+                visible={true}
+                onHide={actionInProgress ? null : handleCancel}
+                size="x-large"
+                contentPadding="none"
+                headerTemplate={(
                     <h3 className="modal__heading">
                         {gettext('Select an existing Planning Item or create a new one')}
                     </h3>
-                    {actionInProgress ? null : (
-                        <a className="icn-btn" onClick={handleCancel}>
-                            <i className="icon-close-small" />
-                        </a>
-                    )}
-                </Modal.Header>
-
-                <Modal.Body noPadding fullHeight noScroll>
-                    <div className="planning-app__modal AddToPlanning">
-                        <AddToPlanningApp
-                            addNewsItemToPlanning={newsItem}
-                            popupContainer={() => this.dom.popupContainer}
-                            onCancel={handleCancel}
-                        />
-                    </div>
-                </Modal.Body>
-
-                <Modal.Footer>
+                )}
+                footerTemplate={(
                     <Button
                         text={gettext('Ignore')}
                         disabled={actionInProgress}
                         onClick={handleCancel}
                     />
-                </Modal.Footer>
-                <div ref={(node) => this.dom.popupContainer = node} />
+                )}
+            >
+                <div className="planning-app__modal AddToPlanning">
+                    <AddToPlanningApp
+                        addNewsItemToPlanning={newsItem}
+                        popupContainer={() => this.dom.popupContainer}
+                        onCancel={handleCancel}
+                    />
+                </div>
             </Modal>
         );
     }

diff --git a/client/components/fields/editor/CustomVocabularies.tsx b/client/components/fields/editor/CustomVocabularies.tsx
@@ -53,6 +53,7 @@ class CustomVocabulariesComponent extends React.PureComponent<IProps> {
                     data-test-id={testId?.length ? `${testId}.${cv._id}` : cv._id}
                 >
                     <TreeSelect
+                        selectBranchWithChildren
                         sortable={true}
                         kind="synchronous"
                         allowMultiple={true}

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "superdesk-planning",
-  "version": "2.8.2",
+  "version": "2.8.3",
   "license": "AGPL-3.0",
   "description": "",
   "repository": {

diff --git a/server/planning/__init__.py b/server/planning/__init__.py
@@ -78,7 +78,7 @@
 from planning.planning_locks import init_app as init_planning_locks_app
 from planning.search.planning_autocomplete import init_app as init_planning_autocomplete_app
 
-__version__ = "2.8.2"
+__version__ = "2.8.3"
 
 _SERVER_PATH = os.path.dirname(os.path.realpath(__file__))
 

diff --git a/setup.py b/setup.py
@@ -15,7 +15,7 @@
 
 setup(
     name="superdesk-planning",
-    version="2.8.2",
+    version="2.8.3",
     description=DESCRIPTION,
     long_description=DESCRIPTION,
     package_dir={"": "server"},