From 5a4b36527e21e87f401b15501418fd739c672d85 Mon Sep 17 00:00:00 2001
From: Bartholomew <mackintosh02@gmail.com>
Date: Sun, 20 Sep 2020 16:36:36 +0100
Subject: [PATCH] fix(widget-relation): set initial metadata value (#4326)

---
 .../src/RelationControl.js                    | 35 +++++++++----------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/packages/netlify-cms-widget-relation/src/RelationControl.js b/packages/netlify-cms-widget-relation/src/RelationControl.js
index bc52d8c0..63d48c7d 100644
--- a/packages/netlify-cms-widget-relation/src/RelationControl.js
+++ b/packages/netlify-cms-widget-relation/src/RelationControl.js
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { Async as AsyncSelect } from 'react-select';
-import { find, isEmpty, last, debounce, get, uniqBy, sortBy } from 'lodash';
+import { find, isEmpty, last, debounce, get, uniqBy } from 'lodash';
 import { List, Map, fromJS } from 'immutable';
 import { reactSelectStyles } from 'netlify-cms-ui-default';
 import { stringTemplate } from 'netlify-cms-lib-widgets';
@@ -55,6 +55,10 @@ function uniqOptions(initial, current) {
   return uniqBy(initial.concat(current), o => o.value);
 }
 
+function getSearchFieldArray(searchFields) {
+  return List.isList(searchFields) ? searchFields.toJS() : [searchFields];
+}
+
 function getSelectedValue({ value, options, isMultiple }) {
   if (isMultiple) {
     const selectedOptions = getSelectedOptions(value);
@@ -111,22 +115,18 @@ export default class RelationControl extends React.Component {
     const initialSearchValues = value && (this.isMultiple() ? getSelectedOptions(value) : [value]);
     if (initialSearchValues && initialSearchValues.length > 0) {
       const metadata = {};
-      const allOptions = await Promise.all(
-        initialSearchValues.map((v, index) => {
-          return query(forID, collection, [field.get('value_field')], v, file, 1).then(
-            ({ payload }) => {
-              const hits = payload.response?.hits || [];
-              const options = this.parseHitOptions(hits);
-              metadata[v] = hits[0]?.data;
-              return { options, index };
-            },
-          );
-        }),
-      );
+      const searchFieldsArray = getSearchFieldArray(field.get('search_fields'));
+      const { payload } = await query(forID, collection, searchFieldsArray, '', file);
+      const hits = payload.response?.hits || [];
+      const options = this.parseHitOptions(hits);
+      const initialOptions = initialSearchValues
+        .map(v => {
+          const selectedOption = options.find(o => o.value === v);
+          metadata[v] = selectedOption?.data;
+          return selectedOption;
+        })
+        .filter(Boolean);
 
-      const initialOptions = [].concat(
-        ...sortBy(allOptions, ({ index }) => index).map(({ options }) => options),
-      );
       this.mounted && this.setState({ initialOptions });
 
       //set metadata
@@ -214,9 +214,8 @@ export default class RelationControl extends React.Component {
   loadOptions = debounce((term, callback) => {
     const { field, query, forID } = this.props;
     const collection = field.get('collection');
-    const searchFields = field.get('search_fields');
     const optionsLength = field.get('options_length') || 20;
-    const searchFieldsArray = List.isList(searchFields) ? searchFields.toJS() : [searchFields];
+    const searchFieldsArray = getSearchFieldArray(field.get('search_fields'));
     const file = field.get('file');
 
     query(forID, collection, searchFieldsArray, term, file, optionsLength).then(({ payload }) => {