@atlaskit/link-datasource 3.12.1 → 3.13.0

package/dist/cjs/ui/issue-like-table/table-cell-content/inline-edit.js

@@ -29,14 +29,16 @@ var editContainerStyles = (0, _primitives.xcss)({
   marginBlockStart: 'space.negative.100'
 });
 var getBackendUpdateValue = function getBackendUpdateValue(typedNewValue) {
-  var _typedNewValue$values, _typedNewValue$values2;
+  var _typedNewValue$values, _typedNewValue$values2, _typedNewValue$values3;
   switch (typedNewValue.type) {
     case 'string':
       return typedNewValue.values[0] || '';
     case 'status':
       return ((_typedNewValue$values = typedNewValue.values[0]) === null || _typedNewValue$values === void 0 ? void 0 : _typedNewValue$values.transitionId) || '';
+    case 'user':
+      return ((_typedNewValue$values2 = typedNewValue.values[0]) === null || _typedNewValue$values2 === void 0 ? void 0 : _typedNewValue$values2.atlassianUserId) || '';
     case 'icon':
-      return ((_typedNewValue$values2 = typedNewValue.values[0]) === null || _typedNewValue$values2 === void 0 ? void 0 : _typedNewValue$values2.id) || '';
+      return ((_typedNewValue$values3 = typedNewValue.values[0]) === null || _typedNewValue$values3 === void 0 ? void 0 : _typedNewValue$values3.id) || '';
   }
   throw new Error("Datasource 2 way sync Backend update value not implemented for type ".concat(typedNewValue.type));
 };
@@ -47,6 +49,7 @@ var mapUpdatedItem = function mapUpdatedItem(existingItem, columnKey, newValue)
         data: newValue.values[0] || ''
       }));
     case 'status':
+    case 'user':
     case 'icon':
       return newValue.values[0] ? _objectSpread(_objectSpread({}, existingItem), {}, (0, _defineProperty2.default)({}, columnKey, {
         data: newValue.values[0]

package/dist/es2019/hooks/useLoadOptions.js

@@ -0,0 +1,63 @@
+import { useEffect, useState } from 'react';
+import { ActionOperationStatus } from '@atlaskit/linking-types';
+import { useDatasourceTableFlag } from './useDatasourceTableFlag';
+const loadOptions = async (fetchInputs = {}, executeFetch) => {
+  if (!executeFetch) {
+    return [];
+  }
+  const result = await executeFetch(fetchInputs);
+  const {
+    operationStatus,
+    entities
+  } = result;
+  if (operationStatus === ActionOperationStatus.FAILURE) {
+    throw new Error('Failed to fetch status options');
+  }
+  return entities !== null && entities !== void 0 ? entities : [];
+};
+export const useLoadOptions = ({
+  fetchInputs,
+  executeFetch
+}) => {
+  const [{
+    options,
+    isLoading,
+    hasFailed
+  }, setOptions] = useState({
+    isLoading: true,
+    options: [],
+    hasFailed: false
+  });
+  const {
+    showErrorFlag
+  } = useDatasourceTableFlag({
+    isFetchAction: true
+  });
+  useEffect(() => {
+    let isMounted = true;
+    loadOptions(fetchInputs, executeFetch).then(options => {
+      if (isMounted) {
+        setOptions({
+          isLoading: false,
+          options,
+          hasFailed: false
+        });
+      }
+    }).catch(err => {
+      showErrorFlag();
+      setOptions({
+        isLoading: false,
+        options: [],
+        hasFailed: true
+      });
+    });
+    return () => {
+      isMounted = false;
+    };
+  }, [fetchInputs, executeFetch, showErrorFlag]);
+  return {
+    options,
+    isLoading,
+    hasFailed
+  };
+};

package/dist/es2019/ui/issue-like-table/edit-type/icon/index.js

@@ -1,13 +1,13 @@
 import _extends from "@babel/runtime/helpers/extends";
-import React, { useEffect, useState } from 'react';
-import { ActionOperationStatus } from '@atlaskit/linking-types';
+import React, { useEffect } from 'react';
+
 // FilterOptionOption is used in the filterOption function which is part of the public API, but the type itself is not exported
 // eslint-disable-next-line import/no-extraneous-dependencies,no-restricted-imports
 
 import Select from '@atlaskit/select';
 import { failUfoExperience, succeedUfoExperience } from '../../../../analytics/ufoExperiences';
 import { useDatasourceExperienceId } from '../../../../contexts/datasource-experience-id';
-import { useDatasourceTableFlag } from '../../../../hooks/useDatasourceTableFlag';
+import { useLoadOptions } from '../../../../hooks/useLoadOptions';
 import { SharedIconComponent } from '../../shared-components/icon';
 import { InlineEditUFOExperience } from '../../table-cell-content/inline-edit';
 /**
@@ -23,7 +23,9 @@ const IconEditType = props => {
     options,
     isLoading,
     hasFailed
-  } = usePriorityOptions(currentValue, executeFetch);
+  } = useLoadOptions({
+    executeFetch
+  });
   const experienceId = useDatasourceExperienceId();
   useEffect(() => {
     if (!experienceId) {
@@ -39,16 +41,17 @@ const IconEditType = props => {
       }, experienceId);
     }
   }, [experienceId, isLoading, hasFailed]);
-  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Select, _extends({}, props, {
-    testId: "inline-edit-priority",
+  return /*#__PURE__*/React.createElement(Select, _extends({}, props, {
     autoFocus: true,
-    defaultMenuIsOpen: true,
     blurInputOnSelect: true,
-    getOptionValue: option => option.text || '',
+    defaultMenuIsOpen: true,
     options: options,
+    menuPlacement: "auto",
     isLoading: isLoading,
-    defaultValue: currentValue === null || currentValue === void 0 ? void 0 : (_currentValue$values = currentValue.values) === null || _currentValue$values === void 0 ? void 0 : _currentValue$values[0],
     filterOption: filterOption,
+    testId: "inline-edit-priority",
+    defaultValue: currentValue === null || currentValue === void 0 ? void 0 : (_currentValue$values = currentValue.values) === null || _currentValue$values === void 0 ? void 0 : _currentValue$values[0],
+    getOptionValue: option => option.text || '',
     formatOptionLabel: ({
       source,
       label,
@@ -63,71 +66,7 @@ const IconEditType = props => {
       type: 'icon',
       values: e ? [e] : []
     })
-  })));
+  }));
 };
 const filterOption = (option, inputValue) => option.label.toLowerCase().includes(inputValue.toLowerCase());
-const usePriorityOptions = (currentValue, executeFetch) => {
-  const [{
-    options,
-    isLoading,
-    hasFailed
-  }, setOptions] = useState({
-    isLoading: true,
-    options: [],
-    hasFailed: false
-  });
-  const {
-    showErrorFlag
-  } = useDatasourceTableFlag({
-    isFetchAction: true
-  });
-  useEffect(() => {
-    let isMounted = true;
-    loadOptions(currentValue, executeFetch).then(options => {
-      if (isMounted) {
-        setOptions({
-          isLoading: false,
-          options,
-          hasFailed: false
-        });
-      }
-    }).catch(err => {
-      showErrorFlag();
-      setOptions({
-        isLoading: false,
-        options: [],
-        hasFailed: true
-      });
-    });
-    return () => {
-      isMounted = false;
-    };
-  }, [currentValue, executeFetch, showErrorFlag]);
-  return {
-    options,
-    isLoading,
-    hasFailed
-  };
-};
-
-/**
- * Load options for the select
- */
-const loadOptions = async (_currentValue, executeFetch) => {
-  if (!executeFetch) {
-    return [];
-  }
-  const {
-    operationStatus,
-    entities
-  } = await executeFetch({});
-  if (operationStatus === ActionOperationStatus.FAILURE) {
-    throw new Error('Failed to fetch icon options');
-  }
-  if (operationStatus === ActionOperationStatus.SUCCESS && entities) {
-    // Map entities here if the backend type is different from the type required by the select
-    return entities;
-  }
-  return [];
-};
 export default IconEditType;

package/dist/es2019/ui/issue-like-table/edit-type/index.js

@@ -3,7 +3,8 @@ import React from 'react';
 import { fg } from '@atlaskit/platform-feature-flags';
 import IconEditType from './icon';
 import StatusEditType from './status';
-import TextEditType, { toTextValue } from './text';
+import TextEditType from './text';
+import UserEditType from './user';
 
 // This is used in editor-card-plugin to identify if any type of inline edit is active.
 const ACTIVE_INLINE_EDIT_ID = 'sllv-active-inline-edit';
@@ -13,10 +14,11 @@ export const editType = ({
   setEditValues,
   executeFetch
 }) => {
+  var _toValueType, _value$atlassianUserI;
   switch (defaultValue.type) {
     case 'string':
       return {
-        defaultValue: toTextValue(defaultValue),
+        defaultValue: (_toValueType = toValueType(defaultValue)) !== null && _toValueType !== void 0 ? _toValueType : '',
         editView: ({
           ...fieldProps
         }) => /*#__PURE__*/React.createElement(TextEditType, _extends({}, fieldProps, {
@@ -27,7 +29,7 @@ export const editType = ({
       };
     case 'icon':
       return {
-        defaultValue: toTextValue(defaultValue),
+        defaultValue: toValueType(defaultValue),
         editView: ({
           value,
           ...fieldProps
@@ -40,7 +42,7 @@ export const editType = ({
       };
     case 'status':
       return {
-        defaultValue: toTextValue(defaultValue),
+        defaultValue: toValueType(defaultValue),
         editView: ({
           ...fieldProps
         }) => /*#__PURE__*/React.createElement(StatusEditType, _extends({}, fieldProps, {
@@ -50,6 +52,19 @@ export const editType = ({
           executeFetch: executeFetch
         }))
       };
+    case 'user':
+      const value = toValueType(defaultValue);
+      return {
+        defaultValue: (_value$atlassianUserI = value === null || value === void 0 ? void 0 : value.atlassianUserId) !== null && _value$atlassianUserI !== void 0 ? _value$atlassianUserI : '',
+        editView: ({
+          ...fieldProps
+        }) => /*#__PURE__*/React.createElement(UserEditType, _extends({}, fieldProps, {
+          currentValue: currentValue,
+          setEditValues: setEditValues,
+          id: ACTIVE_INLINE_EDIT_ID,
+          executeFetch: executeFetch
+        }))
+      };
   }
   return {
     defaultValue: '',
@@ -57,10 +72,14 @@ export const editType = ({
   };
 };
 export const isEditTypeSupported = type => {
-  const supportedEditType = ['string', ...(fg('platform-datasources-enable-two-way-sync-statuses') ? ['status'] : []), ...(fg('platform-datasources-enable-two-way-sync-priority') ? ['icon'] : [])];
+  const supportedEditType = ['string', ...(fg('platform-datasources-enable-two-way-sync-statuses') ? ['status'] : []), ...(fg('platform-datasources-enable-two-way-sync-priority') ? ['icon'] : []), ...(fg('platform-datasources-enable-two-way-sync-assignee') ? ['user'] : [])];
   return supportedEditType.includes(type);
 };
 export const isEditTypeSelectable = type => {
   const selectEditTypes = ['status', 'icon', 'user'];
   return selectEditTypes.includes(type);
+};
+export const toValueType = typeWithValues => {
+  var _typeWithValues$value;
+  return (_typeWithValues$value = typeWithValues.values) === null || _typeWithValues$value === void 0 ? void 0 : _typeWithValues$value[0];
 };

package/dist/es2019/ui/issue-like-table/edit-type/status/index.js

@@ -1,11 +1,10 @@
 import _extends from "@babel/runtime/helpers/extends";
-import React, { useEffect, useState } from 'react';
-import { ActionOperationStatus } from '@atlaskit/linking-types';
+import React, { useEffect } from 'react';
 import Lozenge from '@atlaskit/lozenge';
 import Select from '@atlaskit/select';
 import { failUfoExperience, succeedUfoExperience } from '../../../../analytics/ufoExperiences';
 import { useDatasourceExperienceId } from '../../../../contexts/datasource-experience-id';
-import { useDatasourceTableFlag } from '../../../../hooks/useDatasourceTableFlag';
+import { useLoadOptions } from '../../../../hooks/useLoadOptions';
 import { InlineEditUFOExperience } from '../../table-cell-content/inline-edit';
 const StatusEditType = props => {
   var _currentValue$values;
@@ -17,7 +16,7 @@ const StatusEditType = props => {
     options,
     isLoading,
     hasFailed
-  } = useStatusOptions({
+  } = useLoadOptions({
     executeFetch
   });
   const experienceId = useDatasourceExperienceId();
@@ -36,16 +35,16 @@ const StatusEditType = props => {
     }
   }, [experienceId, isLoading, hasFailed]);
   return /*#__PURE__*/React.createElement(Select, _extends({}, props, {
-    testId: "inline-edit-status",
     autoFocus: true,
+    options: options,
     defaultMenuIsOpen: true,
     blurInputOnSelect: true,
-    getOptionValue: option => option.text,
-    options: options,
+    menuPlacement: "auto",
     isLoading: isLoading,
-    defaultValue: currentValue === null || currentValue === void 0 ? void 0 : (_currentValue$values = currentValue.values) === null || _currentValue$values === void 0 ? void 0 : _currentValue$values[0],
     filterOption: filterOption,
-    menuPlacement: "auto",
+    testId: "inline-edit-status",
+    getOptionValue: option => option.text,
+    defaultValue: currentValue === null || currentValue === void 0 ? void 0 : (_currentValue$values = currentValue.values) === null || _currentValue$values === void 0 ? void 0 : _currentValue$values[0],
     formatOptionLabel: option => /*#__PURE__*/React.createElement(Lozenge, _extends({
       testId: `inline-edit-status-option-${option.text}`
     }, option.style), option.text),
@@ -56,71 +55,4 @@ const StatusEditType = props => {
   }));
 };
 const filterOption = (option, inputValue) => option.data.text.toLowerCase().includes(inputValue.toLowerCase());
-const useStatusOptions = ({
-  fetchInputs,
-  executeFetch
-}) => {
-  const [{
-    options,
-    isLoading,
-    hasFailed
-  }, setOptions] = useState({
-    isLoading: true,
-    options: [],
-    hasFailed: false
-  });
-  const {
-    showErrorFlag
-  } = useDatasourceTableFlag({
-    isFetchAction: true
-  });
-  useEffect(() => {
-    let isMounted = true;
-    loadOptions(fetchInputs, executeFetch).then(options => {
-      if (isMounted) {
-        setOptions({
-          isLoading: false,
-          options,
-          hasFailed: false
-        });
-      }
-    }).catch(err => {
-      showErrorFlag();
-      setOptions({
-        isLoading: false,
-        options: [],
-        hasFailed: true
-      });
-    });
-    return () => {
-      isMounted = false;
-    };
-  }, [fetchInputs, executeFetch, showErrorFlag]);
-  return {
-    options,
-    isLoading,
-    hasFailed
-  };
-};
-const loadOptions = async (fetchInputs = {}, executeFetch) => {
-  if (executeFetch) {
-    const result = await executeFetch(fetchInputs);
-    const {
-      operationStatus,
-      entities
-    } = result;
-    if (operationStatus === ActionOperationStatus.FAILURE) {
-      throw new Error('Failed to fetch status options');
-    }
-    if (entities) {
-      return entities.map(entity => ({
-        id: entity.id,
-        text: entity.text,
-        style: entity.style,
-        transitionId: entity.transitionId
-      }));
-    }
-  }
-  return [];
-};
 export default StatusEditType;

package/dist/es2019/ui/issue-like-table/edit-type/text/index.js

@@ -4,12 +4,12 @@ import { Layering } from '@atlaskit/layering';
 import Textfield from '@atlaskit/textfield';
 import { succeedUfoExperience } from '../../../../analytics/ufoExperiences';
 import { useDatasourceExperienceId } from '../../../../contexts/datasource-experience-id';
-export const toTextValue = typeWithValues => {
-  var _ref, _typeWithValues$value;
-  return (_ref = (_typeWithValues$value = typeWithValues.values) === null || _typeWithValues$value === void 0 ? void 0 : _typeWithValues$value[0]) !== null && _ref !== void 0 ? _ref : '';
-};
 const TextEditType = props => {
+  var _currentValue$values$, _currentValue$values;
   const experienceId = useDatasourceExperienceId();
+  const {
+    currentValue
+  } = props;
   useEffect(() => {
     if (experienceId) {
       succeedUfoExperience({
@@ -27,7 +27,7 @@ const TextEditType = props => {
       // We need 8px left padding to match read only version, but there is already 1px of border
       padding: `${"var(--ds-space-100, 8px)"} calc(${"var(--ds-space-100, 8px)"} - 1px)`
     },
-    value: toTextValue(props.currentValue),
+    value: (_currentValue$values$ = currentValue === null || currentValue === void 0 ? void 0 : (_currentValue$values = currentValue.values) === null || _currentValue$values === void 0 ? void 0 : _currentValue$values[0]) !== null && _currentValue$values$ !== void 0 ? _currentValue$values$ : '',
     onChange: e => props.setEditValues({
       type: 'string',
       values: [e.currentTarget.value]

package/dist/es2019/ui/issue-like-table/edit-type/user/index.js

@@ -0,0 +1,74 @@
+import _extends from "@babel/runtime/helpers/extends";
+import React, { useEffect, useState } from 'react';
+import { useDebouncedCallback } from 'use-debounce';
+import Avatar, { AvatarItem } from '@atlaskit/avatar';
+import Select from '@atlaskit/select';
+import { failUfoExperience, succeedUfoExperience } from '../../../../analytics/ufoExperiences';
+import { useDatasourceExperienceId } from '../../../../contexts/datasource-experience-id';
+import { useLoadOptions } from '../../../../hooks/useLoadOptions';
+import { SEARCH_DEBOUNCE_MS } from '../../../common/modal/popup-select/constants';
+import { USER_TYPE_TEST_ID } from '../../render-type/user';
+import { InlineEditUFOExperience } from '../../table-cell-content/inline-edit';
+const UserEditType = props => {
+  var _currentValue$values;
+  const {
+    currentValue,
+    executeFetch
+  } = props;
+  const [fetchInputs, setFetchInputs] = useState({
+    query: ''
+  });
+  const [handleUserInputDebounced] = useDebouncedCallback(query => setFetchInputs({
+    query
+  }), SEARCH_DEBOUNCE_MS);
+  const {
+    options,
+    isLoading,
+    hasFailed
+  } = useLoadOptions({
+    executeFetch,
+    fetchInputs
+  });
+  const experienceId = useDatasourceExperienceId();
+  useEffect(() => {
+    if (!experienceId) {
+      return;
+    }
+    if (hasFailed) {
+      failUfoExperience({
+        name: InlineEditUFOExperience
+      }, experienceId);
+    } else if (!isLoading) {
+      succeedUfoExperience({
+        name: InlineEditUFOExperience
+      }, experienceId);
+    }
+  }, [experienceId, isLoading, hasFailed]);
+  return /*#__PURE__*/React.createElement(Select, _extends({}, props, {
+    autoFocus: true,
+    defaultMenuIsOpen: true,
+    blurInputOnSelect: true,
+    options: options,
+    isLoading: isLoading,
+    testId: "inline-edit-user",
+    filterOption: () => true // necessary, otherwise by default all options will be filtered out on user input
+    ,
+    onInputChange: handleUserInputDebounced,
+    defaultValue: currentValue === null || currentValue === void 0 ? void 0 : (_currentValue$values = currentValue.values) === null || _currentValue$values === void 0 ? void 0 : _currentValue$values[0],
+    getOptionValue: option => option.atlassianUserId,
+    formatOptionLabel: option => /*#__PURE__*/React.createElement(AvatarItem, {
+      avatar: /*#__PURE__*/React.createElement(Avatar, {
+        appearance: "circle",
+        size: 'small',
+        src: option.avatarSource,
+        testId: `${USER_TYPE_TEST_ID}--avatar--${option.atlassianUserId}`
+      }),
+      primaryText: option.displayName
+    }),
+    onChange: e => props.setEditValues({
+      type: 'user',
+      values: e ? [e] : []
+    })
+  }));
+};
+export default UserEditType;

package/dist/es2019/ui/issue-like-table/table-cell-content/inline-edit.js

@@ -14,14 +14,16 @@ const editContainerStyles = xcss({
   marginBlockStart: 'space.negative.100'
 });
 const getBackendUpdateValue = typedNewValue => {
-  var _typedNewValue$values, _typedNewValue$values2;
+  var _typedNewValue$values, _typedNewValue$values2, _typedNewValue$values3;
   switch (typedNewValue.type) {
     case 'string':
       return typedNewValue.values[0] || '';
     case 'status':
       return ((_typedNewValue$values = typedNewValue.values[0]) === null || _typedNewValue$values === void 0 ? void 0 : _typedNewValue$values.transitionId) || '';
+    case 'user':
+      return ((_typedNewValue$values2 = typedNewValue.values[0]) === null || _typedNewValue$values2 === void 0 ? void 0 : _typedNewValue$values2.atlassianUserId) || '';
     case 'icon':
-      return ((_typedNewValue$values2 = typedNewValue.values[0]) === null || _typedNewValue$values2 === void 0 ? void 0 : _typedNewValue$values2.id) || '';
+      return ((_typedNewValue$values3 = typedNewValue.values[0]) === null || _typedNewValue$values3 === void 0 ? void 0 : _typedNewValue$values3.id) || '';
   }
   throw new Error(`Datasource 2 way sync Backend update value not implemented for type ${typedNewValue.type}`);
 };
@@ -35,6 +37,7 @@ const mapUpdatedItem = (existingItem, columnKey, newValue) => {
         }
       };
     case 'status':
+    case 'user':
     case 'icon':
       return newValue.values[0] ? {
         ...existingItem,

package/dist/esm/hooks/useLoadOptions.js

@@ -0,0 +1,93 @@
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import { useEffect, useState } from 'react';
+import { ActionOperationStatus } from '@atlaskit/linking-types';
+import { useDatasourceTableFlag } from './useDatasourceTableFlag';
+var loadOptions = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+    var fetchInputs,
+      executeFetch,
+      result,
+      operationStatus,
+      entities,
+      _args = arguments;
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          fetchInputs = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
+          executeFetch = _args.length > 1 ? _args[1] : undefined;
+          if (executeFetch) {
+            _context.next = 4;
+            break;
+          }
+          return _context.abrupt("return", []);
+        case 4:
+          _context.next = 6;
+          return executeFetch(fetchInputs);
+        case 6:
+          result = _context.sent;
+          operationStatus = result.operationStatus, entities = result.entities;
+          if (!(operationStatus === ActionOperationStatus.FAILURE)) {
+            _context.next = 10;
+            break;
+          }
+          throw new Error('Failed to fetch status options');
+        case 10:
+          return _context.abrupt("return", entities !== null && entities !== void 0 ? entities : []);
+        case 11:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return function loadOptions() {
+    return _ref.apply(this, arguments);
+  };
+}();
+export var useLoadOptions = function useLoadOptions(_ref2) {
+  var fetchInputs = _ref2.fetchInputs,
+    executeFetch = _ref2.executeFetch;
+  var _useState = useState({
+      isLoading: true,
+      options: [],
+      hasFailed: false
+    }),
+    _useState2 = _slicedToArray(_useState, 2),
+    _useState2$ = _useState2[0],
+    options = _useState2$.options,
+    isLoading = _useState2$.isLoading,
+    hasFailed = _useState2$.hasFailed,
+    setOptions = _useState2[1];
+  var _useDatasourceTableFl = useDatasourceTableFlag({
+      isFetchAction: true
+    }),
+    showErrorFlag = _useDatasourceTableFl.showErrorFlag;
+  useEffect(function () {
+    var isMounted = true;
+    loadOptions(fetchInputs, executeFetch).then(function (options) {
+      if (isMounted) {
+        setOptions({
+          isLoading: false,
+          options: options,
+          hasFailed: false
+        });
+      }
+    }).catch(function (err) {
+      showErrorFlag();
+      setOptions({
+        isLoading: false,
+        options: [],
+        hasFailed: true
+      });
+    });
+    return function () {
+      isMounted = false;
+    };
+  }, [fetchInputs, executeFetch, showErrorFlag]);
+  return {
+    options: options,
+    isLoading: isLoading,
+    hasFailed: hasFailed
+  };
+};