Fix ArrayWidget to support static supermodel vocabulary (#1333)

* Fix ArrayWidget to support static supermodel vocabulary

* Update changelog

* Refactor to use optional chaining

* Make prettier

CHANGELOG.md

@@ -10,6 +10,8 @@
 
 ### Bugfix
 
+- Fix ArrayWidget to support static supermodel vocabulary @datakurre
+
 ### Internal
 
 - Improve the i18n script, only write the pot file if it's really different

src/components/manage/Widgets/ArrayWidget.jsx

@@ -56,7 +56,9 @@ class ArrayWidget extends Component {
     required: PropTypes.bool,
     error: PropTypes.arrayOf(PropTypes.string),
     getVocabulary: PropTypes.func.isRequired,
-    choices: PropTypes.arrayOf(PropTypes.object),
+    choices: PropTypes.arrayOf(
+      PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
+    ),
     loading: PropTypes.bool,
     items: PropTypes.shape({
       vocabulary: PropTypes.object,
@@ -124,7 +126,7 @@ class ArrayWidget extends Component {
    * @returns {undefined}
    */
   componentDidMount() {
-    if (this.vocabBaseUrl) {
+    if (!this.props.items?.choices && this.vocabBaseUrl) {
       this.props.getVocabulary(this.vocabBaseUrl);
     }
   }
@@ -201,7 +203,7 @@ class ArrayWidget extends Component {
               </div>
             </Grid.Column>
             <Grid.Column width="8">
-              {this.vocabBaseUrl ? (
+              {!this.props.items?.choices && this.vocabBaseUrl ? (
                 <AsyncPaginate
                   className="react-select-container"
                   classNamePrefix="react-select"
@@ -282,7 +284,13 @@ export default compose(
         getVocabFromField(props) ||
         getVocabFromItems(props);
       const vocabState = state.vocabularies[vocabBaseUrl];
-      if (vocabState) {
+      // If the schema already has the choices in it, then do not try to get the vocab,
+      // even if there is one
+      if (props.items?.choices) {
+        return {
+          choices: props.items.choices,
+        };
+      } else if (vocabState) {
         return {
           choices: vocabState.items,
           itemsTotal: vocabState.itemsTotal,