@eeacms/volto-clms-theme 1.0.31 → 1.0.36

package/.coverage.babel.config.js

@@ -1 +1,9 @@
-module.exports = require('@plone/volto/babel');
+const defaultBabel = require('@plone/volto/babel');
+
+function applyDefault(api) {
+  const voltoBabel = defaultBabel(api);
+  voltoBabel.plugins.push('@babel/plugin-transform-modules-commonjs', 'transform-class-properties', 'istanbul');
+  return voltoBabel;
+}
+
+module.exports = applyDefault;

package/.project.eslintrc.js

@@ -0,0 +1,46 @@
+const fs = require('fs');
+const path = require('path');
+
+const projectRootPath = fs.realpathSync('./project');    // __dirname
+// const packageJson = require(path.join(projectRootPath, 'package.json'));
+const jsConfig = require(path.join(projectRootPath, 'jsconfig.json')).compilerOptions;
+
+const pathsConfig = jsConfig.paths;
+
+let voltoPath = path.join(projectRootPath, 'node_modules/@plone/volto');
+
+Object.keys(pathsConfig).forEach(pkg => {
+  if (pkg === '@plone/volto') {
+    voltoPath = `./${jsConfig.baseUrl}/${pathsConfig[pkg][0]}`;
+  }
+});
+const AddonConfigurationRegistry = require(`${voltoPath}/addon-registry.js`);
+const reg = new AddonConfigurationRegistry(projectRootPath);
+
+// Extends ESlint configuration for adding the aliases to `src` directories in Volto addons
+const addonAliases = Object.keys(reg.packages).map(o => [
+  o,
+  reg.packages[o].modulePath,
+]);
+
+
+module.exports = {
+  extends: `${projectRootPath}/node_modules/@plone/volto/.eslintrc`,
+  settings: {
+    'import/resolver': {
+      alias: {
+        map: [
+          ['@plone/volto', '@plone/volto/src'],
+          ...addonAliases,
+          ['@package', `${__dirname}/src`],
+          ['~', `${__dirname}/src`],
+        ],
+        extensions: ['.js', '.jsx', '.json'],
+      },
+      'babel-plugin-root-import': {
+        rootPathSuffix: 'src',
+      },
+    },
+  },
+};
+

package/.release-it.json

@@ -1,18 +1,18 @@
 {
+  "npm": {
+    "publish": false
+  },
   "git": {
     "commitMessage": "Automated release ${version}",
     "requireBranch": "develop",
-    "requireCleanWorkingDir": false,
-    "git.requireCommits": true
+    "changelog": "npx auto-changelog --stdout --commit-limit false -u --template https://raw.githubusercontent.com/release-it/release-it/master/templates/changelog-compact.hbs",
+    "tagName": "${version}"
   },
   "github": {
-    "release": false,
+    "release": true,
     "releaseName": "${version}",
     "releaseNotes": "npx auto-changelog --stdout --sort-commits date --commit-limit false -u --template https://raw.githubusercontent.com/release-it/release-it/master/templates/changelog-compact.hbs"
   },
-  "npm": {
-    "publish": false
-  },
   "hooks": {
     "after:bump": "npx auto-changelog --sort-commits date  --commit-limit false -p"
   }

package/CHANGELOG.md

@@ -4,8 +4,91 @@ 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.0.36](https://github.com/eea/volto-clms-theme/compare/1.0.35...1.0.36)
+
+- Unification work based on volto-sustainability-theme [`#103`](https://github.com/eea/volto-clms-theme/pull/103)
+- Footer, Service desk and work oportunities corrections [`#104`](https://github.com/eea/volto-clms-theme/pull/104)
+- add volto-arcgis-block dependency [`c698fd9`](https://github.com/eea/volto-clms-theme/commit/c698fd9f2915d706c97118511e9c7f895baa4f94)
+- add needed addons [`9ff03af`](https://github.com/eea/volto-clms-theme/commit/9ff03af81e84e989366b90180476270c036825cd)
+- reorganize packages.json [`6a574a7`](https://github.com/eea/volto-clms-theme/commit/6a574a7877e9637041f2a32f2bcea0d79b3eeec7)
+- Footer 'expert support provided by' hidden temporaly [`a6815ef`](https://github.com/eea/volto-clms-theme/commit/a6815efd3e6715c6f6e4e70f9e54ac01ed230f18)
+- work oportunities open/close status fixed [`1f28116`](https://github.com/eea/volto-clms-theme/commit/1f2811641ca4752100574f12e16c9abab2c23e8a)
+- Work opportunities working without is_open checkbox [`1f64c61`](https://github.com/eea/volto-clms-theme/commit/1f64c612d67470bf56fd2fd63cbd8f1dc7e80242)
+- work oportunities open/close depends on submission deadline [`a35d5c9`](https://github.com/eea/volto-clms-theme/commit/a35d5c98c343190b45c3fc7052e1db47e12d45b8)
+- change class with className and for with htmlFor [`1b0b8d4`](https://github.com/eea/volto-clms-theme/commit/1b0b8d4876e6fa8f92d907428062d753a06f7bb1)
+- service desk link and style fix [`85479e8`](https://github.com/eea/volto-clms-theme/commit/85479e8124fd176920ae177a3b01f9fe282e383e)
+- Service desk view created [`d7dec45`](https://github.com/eea/volto-clms-theme/commit/d7dec45ef8cfe5e199a0b31d84ebddc5f6e4a608)
+- FAQ style fixed when using a listing block inside acordion block [`ca26614`](https://github.com/eea/volto-clms-theme/commit/ca2661459d3454a5749d23de4c5210bb735b748c)
+- correction in card [`6830866`](https://github.com/eea/volto-clms-theme/commit/683086608caf1d1c127db423a24867b5da125aea)
+- upgrade kitkat [`2f9b905`](https://github.com/eea/volto-clms-theme/commit/2f9b9058d29d48d6f4d7dd6f04840c0076d202ae)
+- merge develop into branch [`26aa1dc`](https://github.com/eea/volto-clms-theme/commit/26aa1dc087dafdc568f1ca3cbb62dbd1ef730502)
+- add commitMessage and requireBranch [`adfc26f`](https://github.com/eea/volto-clms-theme/commit/adfc26f2a87b89b9e7881d591c6215e8467242cd)
+- remove slate dependency [`1863b3c`](https://github.com/eea/volto-clms-theme/commit/1863b3c8e6df0cd4a43ca059ef72ea9804cc5371)
+- add kitkat to dependencies [`5a64f80`](https://github.com/eea/volto-clms-theme/commit/5a64f8068bf3ce33de1685219a50be612450cb05)
+- add kitkat to dependencies [`773a7ed`](https://github.com/eea/volto-clms-theme/commit/773a7ed6cb63fde1eedf52a2eb84f918dc7a439d)
+- unification procces [`63b7258`](https://github.com/eea/volto-clms-theme/commit/63b7258fbe6701f5e4cc4fd1a960446a3b6614cf)
+- package.json modifications [`deade8e`](https://github.com/eea/volto-clms-theme/commit/deade8ea5bad7fe91ecfdaed83ef0fb0afe56ef2)
+- card change [`7f25b11`](https://github.com/eea/volto-clms-theme/commit/7f25b11f2aa49eab7d43f3efe894775ccf8ba217)
+- block card style fix [`06d9631`](https://github.com/eea/volto-clms-theme/commit/06d9631b7fb4188600faa1eb05c8bbad335c2a58)
+- Service desk view first commit [`468289d`](https://github.com/eea/volto-clms-theme/commit/468289def4edcca58c2bf2771c0c14cf89003e4c)
+
+#### [1.0.35](https://github.com/eea/volto-clms-theme/compare/1.0.34...1.0.35)
+
+> 26 October 2021
+
+- Develop into master [`#105`](https://github.com/eea/volto-clms-theme/pull/105)
+- remove slate from addons [`5eaa93c`](https://github.com/eea/volto-clms-theme/commit/5eaa93cd3d3aba1680137236d92b43816a0289e5)
+- removed volto-slate dependency [`a1ba7e5`](https://github.com/eea/volto-clms-theme/commit/a1ba7e50779400df9748ca0ec46f336945d97994)
+- volto-slate:asDefault [`5d763d4`](https://github.com/eea/volto-clms-theme/commit/5d763d4becdfc01aa27d297ed970a2140ecd7f68)
+
+#### [1.0.34](https://github.com/eea/volto-clms-theme/compare/1.0.33...1.0.34)
+
+> 15 October 2021
+
+- comment test for release (nvm) [`#102`](https://github.com/eea/volto-clms-theme/pull/102)
+
+#### [1.0.33](https://github.com/eea/volto-clms-theme/compare/1.0.32...1.0.33)
+
+> 15 October 2021
+
+- Develop [`#101`](https://github.com/eea/volto-clms-theme/pull/101)
+- new arcgis block version [`8607a60`](https://github.com/eea/volto-clms-theme/commit/8607a60034e42b47f34256581b9f34e9c07fd45a)
+- new arcgis block version [`78199f4`](https://github.com/eea/volto-clms-theme/commit/78199f4a397057dfbd182a87a501b9b556bb37fc)
+
+#### [1.0.32](https://github.com/eea/volto-clms-theme/compare/1.0.31...1.0.32)
+
+> 15 October 2021
+
+- Develop [`#100`](https://github.com/eea/volto-clms-theme/pull/100)
+- Downloadtool [`#99`](https://github.com/eea/volto-clms-theme/pull/99)
+- Card block style fix [`#98`](https://github.com/eea/volto-clms-theme/pull/98)
+- top main menu fix [`#97`](https://github.com/eea/volto-clms-theme/pull/97)
+- Use cases carousel fix [`#96`](https://github.com/eea/volto-clms-theme/pull/96)
+- specify form label color only for footer [`d2f1bff`](https://github.com/eea/volto-clms-theme/commit/d2f1bffd10869273e61d6b79ae6513571a417a6f)
+- arcgis block version [`a32ee91`](https://github.com/eea/volto-clms-theme/commit/a32ee918271a131024e34560562795e986998600)
+- optimized downloadtool reducer [`8e54177`](https://github.com/eea/volto-clms-theme/commit/8e541777362d2bde826950afaaba1034ecf4e8e6)
+- card block style fix [`c5227bb`](https://github.com/eea/volto-clms-theme/commit/c5227bbd4ec9120c76fd316b425fb5fbbd56bf96)
+- card block style fix [`c551081`](https://github.com/eea/volto-clms-theme/commit/c55108137230c2a1d620662bb9acd4828e98675c)
+- Buttons popups and titles [`c4c71a0`](https://github.com/eea/volto-clms-theme/commit/c4c71a0bfe0a584438c37a0c192a44fa09509eea)
+- CLMSTaskInProgress component [`b709830`](https://github.com/eea/volto-clms-theme/commit/b7098304abc584de50570d7b1dc272474d7e1719)
+- z-index for header tools dropdown [`7e54bd1`](https://github.com/eea/volto-clms-theme/commit/7e54bd1d69b18d1d48c0d6a8b87fefa6aff64e7e)
+- When task start processing add design to item [`2559caa`](https://github.com/eea/volto-clms-theme/commit/2559caa45e9b7077a2739d30ce1c4d92d2280c9c)
+- on select all cart with task in progress bug fixed [`9582abe`](https://github.com/eea/volto-clms-theme/commit/9582abed5881bb9a3bdbf6f820577ce26e99019f)
+- on cart items post to downloadtool, task start processing [`be7ee24`](https://github.com/eea/volto-clms-theme/commit/be7ee2434c66d34903e995944aa02298c645d503)
+- downloadtool redux action and reducer [`7fcc3de`](https://github.com/eea/volto-clms-theme/commit/7fcc3de64b3db5a43d3a05cbf101b7983a8cd106)
+- prettier [`4cd8768`](https://github.com/eea/volto-clms-theme/commit/4cd876832b7564640e0d0c0aabda9a85f1be9f5e)
+- cartUse hook control if user_id exist [`f97b8ab`](https://github.com/eea/volto-clms-theme/commit/f97b8ab777d3b108e6964efdf8deeb9642818062)
+- header cart counter moved to functional component [`d2e5bbf`](https://github.com/eea/volto-clms-theme/commit/d2e5bbf651b123935abcc8c8f3e65cc6911a8767)
+- progressbar component [`046380a`](https://github.com/eea/volto-clms-theme/commit/046380a5d01deab1887727a7003b7fe6bcd23cd8)
+- post cart selection to downloadtool [`23e6d52`](https://github.com/eea/volto-clms-theme/commit/23e6d52df7f8e0c75c446135099dbfb2bebde5a1)
+- getCartSessionStorage when CART_SESSION_USER_KEY is loaded [`3994dc0`](https://github.com/eea/volto-clms-theme/commit/3994dc0e3ea0facc108bfcd2bc3860ee0f0448a9)
+- changed the cart cache key from user_token to user_id [`e03b53d`](https://github.com/eea/volto-clms-theme/commit/e03b53d98f15a2b556d0a912fe9bc4b216f0d9c4)
+
 #### [1.0.31](https://github.com/eea/volto-clms-theme/compare/1.0.30...1.0.31)
 
+> 14 October 2021
+
+- style changes and arcgis-block new version [`#95`](https://github.com/eea/volto-clms-theme/pull/95)
 - Top main menu dropdown fxed [`#94`](https://github.com/eea/volto-clms-theme/pull/94)
 - volto-arcgis-block new version [`5648dcb`](https://github.com/eea/volto-clms-theme/commit/5648dcb178e418a44cf0729ee2c9a920954f820a)
 - accordion title hover color [`bca1813`](https://github.com/eea/volto-clms-theme/commit/bca181393ec304c2be811f18479c077d13897e77)

package/DEVELOP.md

@@ -6,13 +6,11 @@ Before starting make sure your development environment is properly set. See [Vol
 
 1.  Make sure you have installed `yo`, `@plone/generator-volto` and `mrs-developer`
 
-        $ npm install -g yo
-        $ npm install -g @plone/generator-volto
-        $ npm install -g mrs-developer
+        $ npm install -g yo @plone/generator-volto mrs-developer
 
 1.  Create new volto app
 
-        $ yo @plone/volto my-volto-project --addon @eeacms/volto-addon-template
+        $ yo @plone/volto my-volto-project --addon @eeacms/volto-clms-theme --skip-install
         $ cd my-volto-project
 
 1.  Add the following to `mrs.developer.json`:

package/Makefile

@@ -0,0 +1,39 @@
+SHELL=/bin/bash
+
+DIR=$(shell basename $$(pwd))
+ADDON ?= "@eeacms/volto-clms-theme"
+
+# We like colors
+# From: https://coderwall.com/p/izxssa/colored-makefile-for-golang-projects
+RED=`tput setaf 1`
+GREEN=`tput setaf 2`
+RESET=`tput sgr0`
+YELLOW=`tput setaf 3`
+
+project:
+	npm install -g yo
+	npm install -g @plone/generator-volto
+	npm install -g mrs-developer
+	yo @plone/volto project --addon ${ADDON} --workspace "src/addons/${DIR}" --no-interactive
+	ln -sf $$(pwd) project/src/addons/
+	cp .project.eslintrc.js .eslintrc.js
+	cd project && yarn
+	@echo "-------------------"
+	@echo "$(GREEN)Volto project is ready!$(RESET)"
+	@echo "$(RED)Now run: cd project && yarn start$(RESET)"
+
+all: project
+
+.PHONY: start-test-backend
+start-test-backend: ## Start Test Plone Backend
+	@echo "$(GREEN)==> Start Test Plone Backend$(RESET)"
+	docker run -i --rm -e ZSERVER_HOST=0.0.0.0 -e ZSERVER_PORT=55001 -p 55001:55001 -e SITE=plone -e APPLY_PROFILES=plone.app.contenttypes:plone-content,plone.restapi:default,kitconcept.volto:default-homepage -e CONFIGURE_PACKAGES=plone.app.contenttypes,plone.restapi,kitconcept.volto,kitconcept.volto.cors -e ADDONS='plone.app.robotframework plone.app.contenttypes plone.restapi kitconcept.volto' plone ./bin/robot-server plone.app.robotframework.testing.PLONE_ROBOT_TESTING
+
+.PHONY: start-backend-docker
+start-backend-docker:		## Starts a Docker-based backend
+	@echo "$(GREEN)==> Start Docker-based Plone Backend$(RESET)"
+	docker run -it --rm --name=plone -p 8080:8080 -e SITE=Plone -e ADDONS="kitconcept.volto" -e ZCML="kitconcept.volto.cors" plone
+
+.PHONY: help
+help:		## Show this help.
+	@echo -e "$$(grep -hE '^\S+:.*##' $(MAKEFILE_LIST) | sed -e 's/:.*##\s*/:/' -e 's/^\(.\+\):\(.*\)/\\x1b[36m\1\\x1b[m:\2/' | column -c2 -t -s :)"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-clms-theme",
-  "version": "1.0.31",
+  "version": "1.0.36",
   "description": "volto-clms-theme: Volto theme for CLMS site",
   "main": "src/index.js",
   "author": "CodeSyntax for the European Environment Agency",
@@ -24,26 +24,39 @@
     "@eeacms/volto-accordion-block",
     "@eeacms/volto-metadata-block",
     "@eeacms/volto-resize-helper",
-    "volto-slate:simpleLink",
     "@eeacms/volto-tabs-block"
   ],
   "dependencies": {
+    "@eeacms/volto-tabs-block": "1.2.7",
+    "@eeacms/volto-accordion-block": "3.4.7",
+    "@eeacms/volto-columns-block": "4.4.3",
+    "@eeacms/volto-metadata-block": "^2.1.0",
+    "@eeacms/volto-resize-helper": "0.2.1",
     "volto-dropdownmenu": "2.2.7",
-    "@eeacms/volto-arcgis-block": "0.1.8",
     "@fortawesome/fontawesome-svg-core": "1.2.35",
     "@fortawesome/free-solid-svg-icons": "5.15.3",
     "@fortawesome/free-regular-svg-icons": "5.15.3",
     "@fortawesome/react-fontawesome": "0.1.14",
-    "@eeacms/volto-tabs-block": "1.2.7",
     "react-slick": "0.28.1",
     "slick-carousel": "1.8.1",
-    "@eeacms/volto-accordion-block": "3.4.4",
-    "@eeacms/volto-columns-block": "4.4.3",
-    "@eeacms/volto-metadata-block": "^2.1.0",
-    "volto-slate": "2.6.2",
     "react-svg": "14.0.4",
-    "react-native-mime-types": "2.3.0",
-    "@eeacms/volto-resize-helper": "0.2.1"
+    "@eeacms/volto-arcgis-block": "*",
+    "react-native-mime-types": "2.3.0"
+  },
+  "devDependencies": {
+    "eslint": "^6.8.0",
+    "eslint-config-prettier": "^8.2.0",
+    "eslint-plugin-prettier": "3.1.3",
+    "eslint-plugin-react-app": "^6.2.2",
+    "husky": "6.0.0",
+    "jsconfig": "^0.2.0",
+    "prettier": "2.0.5",
+    "prettier-eslint": "^12.0.0",
+    "stylelint": "^13.12.0",
+    "stylelint-config-idiomatic-order": "8.1.0",
+    "stylelint-prettier": "1.1.2",
+    "@cypress/code-coverage": "^3.9.5",
+    "babel-plugin-transform-class-properties": "^6.24.1"
   },
   "prettier": {
     "trailingComma": "all",
@@ -96,20 +109,5 @@
     "cypress:open": "NODE_ENV=production CYPRESS_API=plone ../../../node_modules/cypress/bin/cypress open",
     "precommit": "yarn stylelint && yarn prettier && yarn lint",
     "prepare": "husky install"
-  },
-  "devDependencies": {
-    "eslint": "^6.8.0",
-    "eslint-config-prettier": "^8.2.0",
-    "eslint-plugin-prettier": "3.1.3",
-    "eslint-plugin-react-app": "^6.2.2",
-    "husky": "6.0.0",
-    "jsconfig": "^0.2.0",
-    "prettier": "2.0.5",
-    "prettier-eslint": "^12.0.0",
-    "stylelint": "^13.12.0",
-    "stylelint-config-idiomatic-order": "8.1.0",
-    "stylelint-prettier": "1.1.2",
-    "@cypress/code-coverage": "^3.9.5",
-    "babel-plugin-transform-class-properties": "^6.24.1"
   }
 }

package/src/actions/cart/cart.js

@@ -4,7 +4,6 @@
  */
 export const GET_CART_ITEMS = 'GET_CART_ITEMS';
 export const SET_CART_ITEMS = 'SET_CART_ITEMS';
-
 /**
  * Set Cart items.
  * @function setCartItems
@@ -13,7 +12,7 @@ export const SET_CART_ITEMS = 'SET_CART_ITEMS';
 export function setCartItems(items) {
   return {
     type: SET_CART_ITEMS,
-    items,
+    items: items,
   };
 }
 
@@ -22,10 +21,10 @@ export function setCartItems(items) {
  * @function getCartItems
  * @returns {Object} Get extra items action.
  */
-export function getCartItems(token, localStorage) {
+
+export function getCartItems(user_id) {
   return {
     type: GET_CART_ITEMS,
-    token,
-    localStorage,
+    user_id: user_id,
   };
 }

package/src/actions/downloadtool/delete_downloadtool.js

@@ -0,0 +1,21 @@
+/**
+ * Post cart selection to downloadtool.
+ * @module actions/postDownloadtool
+ */
+export const DELETE_DOWNLOADTOOL = 'DELETE_DOWNLOADTOOL';
+
+/**
+ * delete cart selection to downloadtool.
+ * @function deleteDownloadtool
+ * @returns {Object} Get extra items action.
+ */
+export function deleteDownloadtool(user_id, task_id) {
+  return {
+    type: DELETE_DOWNLOADTOOL,
+    request: {
+      op: 'del',
+      data: { UserID: user_id, TaskID: task_id },
+      path: '/@datarequest_delete',
+    },
+  };
+}

package/src/actions/downloadtool/get_downloadtool.js

@@ -0,0 +1,20 @@
+/**
+ * Get cart selection to downloadtool.
+ * @module actions/getDownloadtool
+ */
+export const GET_DOWNLOADTOOL = 'GET_DOWNLOADTOOL';
+
+/**
+ * Get cart selection to downloadtool.
+ * @function GetDownloadtool
+ * @returns {Object} Get extra items action.
+ */
+export function getDownloadtool(user_id) {
+  return {
+    type: GET_DOWNLOADTOOL,
+    request: {
+      op: 'get',
+      path: `/@datarequest_search?UserID=${user_id}&Status=In_progress`,
+    },
+  };
+}

package/src/actions/downloadtool/post_downloadtool.js

@@ -0,0 +1,21 @@
+/**
+ * Post cart selection to downloadtool.
+ * @module actions/postDownloadtool
+ */
+export const POST_DOWNLOADTOOL = 'POST_DOWNLOADTOOL';
+
+/**
+ * Post cart selection to downloadtool.
+ * @function PostDownloadtool
+ * @returns {Object} Get extra items action.
+ */
+export function postDownloadtool(item) {
+  return {
+    type: POST_DOWNLOADTOOL,
+    request: {
+      op: 'post',
+      data: item,
+      path: '/@datarequest_post',
+    },
+  };
+}

package/src/actions/index.js

@@ -33,3 +33,15 @@ export {
   MEETING_SUBSCRIBERS,
   MeetingSubscribers,
 } from './meeting/meeting_subscribers';
+export {
+  POST_DOWNLOADTOOL,
+  postDownloadtool,
+} from './downloadtool/post_downloadtool';
+export {
+  GET_DOWNLOADTOOL,
+  getDownloadtool,
+} from './downloadtool/get_downloadtool';
+export {
+  DELETE_DOWNLOADTOOL,
+  deleteDownloadtool,
+} from './downloadtool/delete_downloadtool';

package/src/components/Blocks/CclHomeUsersBlock/styles.less

@@ -68,7 +68,8 @@
 }
 
 .ccl-list-items .ccl-list-item .ccl-list-item-image img {
-  max-height: 11rem;
+  width: 100%;
+  height: 100%;
   object-fit: cover;
 }
 

package/src/components/Blocks/CustomTemplates/VoltoListingBlock/CclListingWorkOpportunities.jsx

@@ -36,17 +36,33 @@ const CclWorkOpportunity = (props) => {
   );
 };
 
+function formatDate(date) {
+  var d = new Date(date),
+    month = '' + (d.getMonth() + 1),
+    day = '' + d.getDate(),
+    year = d.getFullYear();
+
+  if (month.length < 2) month = '0' + month;
+  if (day.length < 2) day = '0' + day;
+
+  return [year, month, day].join('-');
+}
+
+var Today = formatDate(Date.now());
+
 const CclListingWorkOpportunities = (props) => {
   const { items, variation } = props;
   const intl = useIntl();
 
   const regex = /CclWO/;
   const status = variation?.replace(regex, '');
-
   return (
     <>
       {items
-        .filter((item) => item.is_open && status === 'OpenTenders')
+        .filter(
+          (item) =>
+            item.submission_deadline < Today && status === 'CloseTenders',
+        )
         .map((item, index) => (
           <CclWorkOpportunity
             key={index}
@@ -55,7 +71,10 @@ const CclListingWorkOpportunities = (props) => {
           ></CclWorkOpportunity>
         ))}
       {items
-        .filter((item) => !item.is_open && status === 'CloseTenders')
+        .filter(
+          (item) =>
+            item.submission_deadline > Today && status === 'OpenTenders',
+        )
         .map((item, index) => (
           <CclWorkOpportunity
             key={index}