upgrades TinyMce

package.json

@@ -24,7 +24,6 @@
     "babel-loader": "^8.0.0",
     "bootstrap": "^3.4.1",
     "classnames": "^2.2.5",
-    "codemirror": "^5.34.0",
     "core-js": "^3.26.1",
     "cssnano": "^4.1",
     "d3": "^4.4.0",
@@ -53,17 +52,15 @@
     "redux-thunk": "^2.3.0",
     "reselect": "^4.0.0",
     "shelljs": "^0.5.3",
-    "svg4everybody": "^2.1.2",
     "swagger-ui-react": "3.51.2",
     "tinycolor2": "^1.4.1",
-    "tinymce": "^4.9.3",
-    "tinymce-codemirror": "git+https://github.com/christiaan/tinymce-codemirror.git#20c1bbe708",
+    "tinymce": "^6.3",
+    "@tinymce/tinymce-react": "^4.2",
     "uuid": "^9.0.0",
     "video.js": "7.7.4",
     "wavesurfer.js": "2.2.1",
     "webpack": "^5.75.0",
-    "webpack-cli": "^5.0.1",
-    "whatwg-fetch": "^2.0.1"
+    "webpack-cli": "^5.0.1"
   },
   "files": [
     "package.json"

src/main/app/Resources/modules/content/form/components/form.jsx

@@ -28,8 +28,6 @@ FormWrapper.defaultProps = {
   embedded: false
 }
 
-// TODO : maybe manage ContentMeta display here
-
 class Form extends Component {
   constructor(props) {
     super(props)

src/main/app/Resources/modules/content/form/store/actions.js

@@ -45,6 +45,7 @@ actions.getItemLock = (className, id) => (dispatch) => {
     dispatch({
       [API_REQUEST]: {
         url: ['apiv2_object_lock_get', {class: className, id}],
+        silent: true,
         request: {
           method: 'GET'
         },
@@ -84,6 +85,7 @@ actions.validateLock = (lock) => (dispatch, getState) => {
 actions.lockItem = (className, id) => ({
   [API_REQUEST]: {
     url: ['apiv2_object_lock', {class: className, id}],
+    silent: true,
     request: {
       method: 'PUT'
     }
@@ -93,6 +95,7 @@ actions.lockItem = (className, id) => ({
 actions.unlockItem = (className, id) => ({
   [API_REQUEST]: {
     url: ['apiv2_object_unlock', {class: className, id}],
+    silent: true,
     request: {
       method: 'PUT'
     }

src/main/app/Resources/modules/data/types/choice/index.js

@@ -1,9 +1,11 @@
 import differenceBy from 'lodash/differenceBy'
+import get from 'lodash/get'
 
 import {trans, tval} from '#/main/app/intl/translation'
 
 import {ChoiceInput} from '#/main/app/data/types/choice/components/input'
 import {ChoiceSearch} from '#/main/app/data/types/choice/components/search'
+import {makeId} from '#/main/core/scaffolding/id'
 
 const dataType = {
   name: 'choice',
@@ -28,12 +30,20 @@ const dataType = {
       label: trans('condensed_display')
     }, {
       name: 'choices',
-      type: 'enum',
+      type: 'collection',
       label: trans('choices_list'),
+      calculated: (data) => {
+        //get(data, 'options.choices', [])
+        console.log(data)
+        // data ? data.map(choice => choice.value) : []
+        return get(data, 'options.choices', []).map(choice => choice.value)
+      },
       options: {
+        type: 'string',
         placeholder: trans('no_choice'),
-        addButtonLabel: trans('add_a_choice'),
-        unique: true
+        button: trans('add_a_choice'),
+        unique: true,
+        defaultItem: {id: makeId(), value: ''}
       },
       required: true
     }

src/main/app/Resources/modules/data/types/html/components/input.jsx

@@ -166,7 +166,7 @@ class HtmlInput extends Component {
       <Tinymce
         id={this.props.id}
         placeholder={this.props.placeholder}
-        content={this.props.value || ''}
+        value={this.props.value || ''}
         workspace={this.props.workspace}
         disabled={this.props.disabled}
         onChange={this.props.onChange}