@eeacms/volto-eea-website-policy 1.12.1 → 1.13.1

package/CHANGELOG.md

@@ -4,13 +4,25 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
-### [1.12.1](https://github.com/eea/volto-eea-website-policy/compare/1.13.0-beta.1...1.12.1) - 18 January 2024
+### [1.13.1](https://github.com/eea/volto-eea-website-policy/compare/1.13.0...1.13.1) - 28 March 2024
 
-### [1.13.0-beta.1](https://github.com/eea/volto-eea-website-policy/compare/1.12.0...1.13.0-beta.1) - 17 January 2024
+#### :bug: Bug Fixes
+
+- fix: make sure that the content type is sent in workflow change - refs #267108 [dobri1408 - [`934352d`](https://github.com/eea/volto-eea-website-policy/commit/934352dc16248a7f6a13499ed99910ca5f67d577)]
+
+### [1.13.0](https://github.com/eea/volto-eea-website-policy/compare/1.13.0-beta.1...1.13.0) - 19 February 2024
+
+#### :rocket: New Features
+
+- feat: inforce required fields on workflow change - refs #262289 [dobri1408 - [`b6f939d`](https://github.com/eea/volto-eea-website-policy/commit/b6f939d4274b87607ef69adabb3c49b2b5c03354)]
 
 #### :hammer_and_wrench: Others
 
-- Registered login-authomatic [Alexandru Ghica - [`f9e5821`](https://github.com/eea/volto-eea-website-policy/commit/f9e58217971de1ae75b4394ca02a016d508a4edf)]
+- Release 1.13.0 [alin - [`baea684`](https://github.com/eea/volto-eea-website-policy/commit/baea684dc2bb8968ddb6125c4d66bd4cb95c74c8)]
+### [1.13.0-beta.1](https://github.com/eea/volto-eea-website-policy/compare/1.12.1...1.13.0-beta.1) - 17 January 2024
+
+### [1.12.1](https://github.com/eea/volto-eea-website-policy/compare/1.12.0...1.12.1) - 18 January 2024
+
 ### [1.12.0](https://github.com/eea/volto-eea-website-policy/compare/1.12.0-beta.4...1.12.0) - 17 January 2024
 
 ### [1.12.0-beta.4](https://github.com/eea/volto-eea-website-policy/compare/1.12.0-beta.2...1.12.0-beta.4) - 12 January 2024

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-eea-website-policy",
-  "version": "1.12.1",
+  "version": "1.13.1",
   "description": "@eeacms/volto-eea-website-policy: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

package/src/customizations/volto/components/manage/Workflow/Workflow.jsx

@@ -35,6 +35,10 @@ const messages = defineMessages({
     id: 'Workflow updated.',
     defaultMessage: 'Workflow updated.',
   },
+  notAllowedToUpdateWorkflow: {
+    id: 'notAllowedToUpdateWorkflow',
+    defaultMessage: 'Please fill out all the required fields',
+  },
   messageNoWorkflow: {
     id: 'No workflow',
     defaultMessage: 'No workflow',
@@ -45,6 +49,21 @@ const messages = defineMessages({
   },
 });
 
+const filter_remaining_steps = (values, key) => {
+  return values.filter((value) => {
+    const is_not_ready = !value.is_ready;
+    if (!is_not_ready) {
+      return false;
+    }
+    const states = value.states;
+    const required_for_all = states?.indexOf('all') !== -1;
+    return (
+      (is_not_ready && required_for_all) ||
+      (is_not_ready && states?.indexOf(key) !== -1)
+    );
+  });
+};
+
 const SingleValue = injectLazyLibs('reactSelect')(({ children, ...props }) => {
   const stateDecorator = {
     marginRight: '10px',
@@ -184,6 +203,7 @@ class Workflow extends Component {
     workflowLoaded: PropTypes.func,
     loaded: PropTypes.bool.isRequired,
     pathname: PropTypes.string.isRequired,
+
     contentHistory: PropTypes.arrayOf(
       PropTypes.shape({
         review_state: PropTypes.string,
@@ -245,15 +265,32 @@ class Workflow extends Component {
    * @returns {undefined}
    */
   transition = (selectedOption) => {
-    this.props.transitionWorkflow(flattenToAppURL(selectedOption.url));
-    this.setState({ selectedOption });
-    toast.success(
-      <Toast
-        success
-        title={this.props.intl.formatMessage(messages.messageUpdated)}
-        content=""
-      />,
-    );
+    if (
+      filter_remaining_steps(
+        this.props.editingProgressSteps,
+        this.props?.content?.review_state || '',
+      ).length === 0
+    ) {
+      this.props.transitionWorkflow(flattenToAppURL(selectedOption.url));
+      this.setState({ selectedOption });
+      toast.success(
+        <Toast
+          success
+          title={this.props.intl.formatMessage(messages.messageUpdated)}
+          content=""
+        />,
+      );
+    } else {
+      toast.error(
+        <Toast
+          error
+          title={this.props.intl.formatMessage(
+            messages.notAllowedToUpdateWorkflow,
+          )}
+          content=""
+        />,
+      );
+    }
   };
 
   selectValue = (option) => {
@@ -367,13 +404,17 @@ export default compose(
   injectLazyLibs(['reactSelect']),
   withRouter,
   connect(
-    (state) => ({
+    (state, props) => ({
       loaded: state.workflow.transition.loaded,
       content: state.content.data,
       workflowLoaded: state.workflow.get?.loaded,
       contentHistory: state.workflow.history,
       transitions: state.workflow.transitions,
       currentStateValue: getCurrentStateMapping(state.workflow.currentState),
+      editingProgressSteps:
+        state?.editingProgress?.editing?.loaded === true
+          ? state?.editingProgress?.result?.steps
+          : [],
     }),
     { getContent, getWorkflow, transitionWorkflow },
   ),