From eb2fd6574d386fe84da7d8a59ce79b0d5cfd53de Mon Sep 17 00:00:00 2001
From: Aurelsicoko <aurelsicoko@gmail.com>
Date: Wed, 1 Aug 2018 13:58:57 +0200
Subject: [PATCH] Force unique value in selectMany component

---
 .../admin/src/components/SelectMany/index.js  | 50 ++++++++++++++-----
 packages/strapi/bin/strapi-start.js           |  3 +-
 2 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/packages/strapi-plugin-content-manager/admin/src/components/SelectMany/index.js b/packages/strapi-plugin-content-manager/admin/src/components/SelectMany/index.js
index 8d9f445add..800cd53895 100644
--- a/packages/strapi-plugin-content-manager/admin/src/components/SelectMany/index.js
+++ b/packages/strapi-plugin-content-manager/admin/src/components/SelectMany/index.js
@@ -10,7 +10,7 @@ import { FormattedMessage } from 'react-intl';
 import { SortableContainer, SortableElement, arrayMove } from 'react-sortable-hoc';
 import PropTypes from 'prop-types';
 import cn from 'classnames';
-import { cloneDeep, isArray, isNull, isUndefined, get, findIndex, includes } from 'lodash';
+import { cloneDeep, isArray, isNull, isUndefined, get, findIndex, includes, isEmpty } from 'lodash';
 
 // Utils.
 import request from 'utils/request';
@@ -64,23 +64,29 @@ const SortableList = SortableContainer(({items, onRemove, onClick}) => {
   );
 });
 
-class SelectMany extends React.Component {
-  // eslint-disable-line react/prefer-stateless-function
-  constructor(props) {
-    super(props);
-
-    this.state = {
-      isLoading: true,
-      options: [],
-      toSkip: 0,
-    };
-  }
+class SelectMany extends React.PureComponent {
+  state = {
+    isLoading: true,
+    options: [],
+    toSkip: 0,
+  };
 
   componentDidMount() {
     this.getOptions('');
   }
 
   componentDidUpdate(prevProps, prevState) {
+    if (isEmpty(prevProps.record) && !isEmpty(this.props.record)) {
+      const values = (get(this.props.record, this.props.relation.alias) || [])
+        .map(el => (el.id || el._id));
+
+      const options = this.state.options.filter(el => {
+        return !values.includes(el.value.id || el.value._id);
+      });
+
+      this.state.options = options;
+    }
+
     if (prevState.toSkip !== this.state.toSkip) {
       this.getOptions('');
     }
@@ -146,9 +152,18 @@ class SelectMany extends React.Component {
     const target = {
       name: `record.${this.props.relation.alias}`,
       type: 'select',
-      value: [...values, value],
+      value: [...values, value.value],
     };
 
+    // Remove new added value from available option;
+    this.state.options = this.state.options.filter(el => {
+      if (el.value._id || el.value.id === value.value.id || value.value._id) {
+        return false;
+      }
+
+      return true;
+    });
+
     this.props.setRecordAttribute({ target });
   };
 
@@ -176,6 +191,7 @@ class SelectMany extends React.Component {
       type: 'select',
       value: arrayMove(values, oldIndex, newIndex),
     };
+
     this.props.setRecordAttribute({ target });
   };
 
@@ -186,6 +202,14 @@ class SelectMany extends React.Component {
       type: 'select',
       value: values.filter( (item, idx) => idx !== index),
     };
+
+    // Add removed value from available option;
+    this.state.options.push({
+      value: values[index],
+      label: templateObject({ mainField: this.props.relation.displayedAttribute }, values[index])
+        .mainField,
+    });
+
     this.props.setRecordAttribute({ target });
   }
 
diff --git a/packages/strapi/bin/strapi-start.js b/packages/strapi/bin/strapi-start.js
index 9f109f43c7..1979a36b59 100755
--- a/packages/strapi/bin/strapi-start.js
+++ b/packages/strapi/bin/strapi-start.js
@@ -66,7 +66,8 @@ module.exports = function(appPath = '') {
       };
 
       const setFilesToWatch = (src) => {
-        var files = fs.readdirSync(src);
+        let files = _.includes(src, '/admin') || _.includes(src, 'components') ? [] : fs.readdirSync(src);
+
         _.forEach(files, file => {
           if (
             _.startsWith(file, '.') ||