@performant-software/user-defined-fields 2.2.3-beta.2 → 2.2.3-beta.3

package/types/hooks/UserDefinedFields.js.flow

@@ -22,7 +22,7 @@ import UserDefinedFieldsService from '../services/UserDefinedFields';
  * @returns {{userDefinedColumns: [], loading: boolean}}
  */
 const useUserDefinedColumns = (defineableId, defineableType, options = {}) => {
-  const [fields, setFields] = useState([]);
+  const [userDefinedFields, setUserDefinedFields] = useState([]);
   const [loading, setLoading] = useState(false);
 
   const { sortable = true } = options;
@@ -54,7 +54,7 @@ const useUserDefinedColumns = (defineableId, defineableType, options = {}) => {
   const userDefinedColumns = useMemo(() => {
     const columns = [];
 
-    _.each(fields, (field) => {
+    _.each(userDefinedFields, (field) => {
       const column = {
         name: field.uuid,
         label: field.column_name,
@@ -89,7 +89,7 @@ const useUserDefinedColumns = (defineableId, defineableType, options = {}) => {
     });
 
     return columns;
-  }, [fields, resolveValue]);
+  }, [resolveValue, userDefinedFields]);
 
   /**
    * Fetches the user defined fields for the passed defineable ID and defineable type.
@@ -99,13 +99,14 @@ const useUserDefinedColumns = (defineableId, defineableType, options = {}) => {
 
     UserDefinedFieldsService
       .fetchAll({ defineable_id: defineableId, defineable_type: defineableType })
-      .then(({ data }) => setFields(data.user_defined_fields))
+      .then(({ data }) => setUserDefinedFields(data.user_defined_fields))
       .finally(() => setLoading(false));
   }, [defineableId, defineableId]);
 
   return {
     loading,
-    userDefinedColumns
+    userDefinedColumns,
+    userDefinedFields
   };
 };
 

package/types/index.js.flow

@@ -7,6 +7,9 @@ export { default as UserDefinedFieldsEmbeddedList } from './components/UserDefin
 export { default as UserDefinedFieldsForm } from './components/UserDefinedFieldsForm';
 export { default as UserDefinedFieldsList } from './components/UserDefinedFieldsList';
 
+// Constants
+export { DataTypes } from './constants/DataTypes';
+
 // Hooks
 export { default as useUserDefinedColumns } from './hooks/UserDefinedFields';