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

package/dist/index.es7.js

@@ -1,8 +1,8 @@
-import { j as f } from "./index.es13.js";
-import { BooleanIcon as _ } from "@performant-software/semantic-components";
-import { Date as D } from "@performant-software/shared-components";
-import { useCallback as h, useMemo as v, useState as d, useEffect as y } from "react";
-import x from "./index.es16.js";
+import { j as h } from "./index.es13.js";
+import { BooleanIcon as v } from "@performant-software/semantic-components";
+import { Date as y } from "@performant-software/shared-components";
+import { useState as a, useCallback as D, useMemo as x, useEffect as b } from "react";
+import R from "./index.es16.js";
 import "./index.es17.js";
 import "./index.es18.js";
 import "./index.es19.js";
@@ -30,53 +30,46 @@ import "./index.es40.js";
 import "./index.es41.js";
 import "./index.es42.js";
 import "./index.es43.js";
-import { DataTypes as l } from "./index.es49.js";
-import F from "./index.es8.js";
-const te = (s, u, t = {}) => {
-  const { loading: n, userDefinedFields: p } = b(s, u), { sortable: a = !0 } = t, i = h((r, e) => {
-    let o = r;
-    return t.resolveRecord && (o = t.resolveRecord(r)), o.user_defined ? o.user_defined[e.uuid] : null;
-  }, [t.resolveRecord]), c = v(() => {
+import { DataTypes as p } from "./index.es49.js";
+import j from "./index.es8.js";
+const me = (s, l, m = {}) => {
+  const [n, c] = a([]), [d, u] = a(!1), { sortable: f = !0 } = m, i = D((r, e) => {
+    let t = r;
+    return m.resolveRecord && (t = m.resolveRecord(r)), t.user_defined ? t.user_defined[e.uuid] : null;
+  }, [m.resolveRecord]), _ = x(() => {
     const r = [];
-    return x.each(p, (e) => {
-      const o = {
+    return R.each(n, (e) => {
+      const t = {
         name: e.uuid,
         label: e.column_name,
         hidden: !0,
-        sortable: a
+        sortable: f
       };
-      e.data_type === l.boolean && r.push({
-        ...o,
-        render: (m) => /* @__PURE__ */ f.jsx(
-          _,
+      e.data_type === p.boolean && r.push({
+        ...t,
+        render: (o) => /* @__PURE__ */ h.jsx(
+          v,
           {
-            value: i(m, e)
+            value: i(o, e)
           }
         )
-      }), e.data_type === l.date && r.push({
-        ...o,
-        resolve: (m) => D.formatDate(i(m, e))
-      }), e.data_type !== l.richText && r.push({
-        ...o,
-        resolve: (m) => i(m, e)
+      }), e.data_type === p.date && r.push({
+        ...t,
+        resolve: (o) => y.formatDate(i(o, e))
+      }), e.data_type !== p.richText && r.push({
+        ...t,
+        resolve: (o) => i(o, e)
       });
     }), r;
-  }, [p, i]);
-  return {
-    loading: n,
-    userDefinedColumns: c
-  };
-}, b = (s, u) => {
-  const [t, n] = d(!1), [p, a] = d([]);
-  return y(() => {
-    n(!0), F.fetchAll({ defineable_id: s, defineable_type: u }).then(({ data: i }) => a(i.user_defined_fields)).finally(() => n(!1));
+  }, [n, i]);
+  return b(() => {
+    u(!0), j.fetchAll({ defineable_id: s, defineable_type: l }).then(({ data: r }) => c(r.user_defined_fields)).finally(() => u(!1));
   }, [s, s]), {
-    loading: t,
-    userDefinedFields: p
+    loading: d,
+    userDefinedColumns: _
   };
 };
 export {
-  te as useUserDefinedColumns,
-  b as useUserDefinedFields
+  me as default
 };
 //# sourceMappingURL=index.es7.js.map

package/dist/index.es7.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.es7.js","sources":["../src/hooks/UserDefinedFields.js"],"sourcesContent":["// @flow\n\nimport { BooleanIcon } from '@performant-software/semantic-components';\nimport { Date as DateUtils } from '@performant-software/shared-components';\nimport React, {\n  useCallback,\n  useEffect,\n  useMemo,\n  useState\n} from 'react';\nimport _ from 'underscore';\nimport { DataTypes } from '../constants/DataTypes';\nimport UserDefinedFieldsService from '../services/UserDefinedFields';\n\n/**\n * Returns the loading state and list of user defined columns for the passed defineable ID and defineable type.\n *\n * @param defineableId\n * @param defineableType\n * @param options\n *\n * @returns {{userDefinedColumns: [], loading: boolean}}\n */\nexport const useUserDefinedColumns = (defineableId, defineableType, options = {}) => {\n  const { loading, userDefinedFields } = useUserDefinedFields(defineableId, defineableType);\n  const { sortable = true } = options;\n\n  /**\n   * Resolves the user defined field value for the passed item.\n   *\n   * @type {(function(*, *): (null|*))|*}\n   */\n  const resolveValue = useCallback((item, field) => {\n    let record = item;\n\n    if (options.resolveRecord) {\n      record = options.resolveRecord(item);\n    }\n\n    if (!record.user_defined) {\n      return null;\n    }\n\n    return record.user_defined[field.uuid];\n  }, [options.resolveRecord]);\n\n  /**\n   * Memo-izes the columns.\n   *\n   * @type {[]}\n   */\n  const userDefinedColumns = useMemo(() => {\n    const columns = [];\n\n    _.each(userDefinedFields, (field) => {\n      const column = {\n        name: field.uuid,\n        label: field.column_name,\n        hidden: true,\n        sortable\n      };\n\n      if (field.data_type === DataTypes.boolean) {\n        columns.push({\n          ...column,\n          render: (item) => (\n            <BooleanIcon\n              value={resolveValue(item, field)}\n            />\n          )\n        });\n      }\n\n      if (field.data_type === DataTypes.date) {\n        columns.push({\n          ...column,\n          resolve: (item) => DateUtils.formatDate(resolveValue(item, field))\n        });\n      }\n\n      if (field.data_type !== DataTypes.richText) {\n        columns.push({\n          ...column,\n          resolve: (item) => resolveValue(item, field)\n        });\n      }\n    });\n\n    return columns;\n  }, [userDefinedFields, resolveValue]);\n\n  return {\n    loading,\n    userDefinedColumns\n  };\n};\n\nexport const useUserDefinedFields = (defineableId, defineableType) => {\n  const [loading, setLoading] = useState(false);\n  const [userDefinedFields, setUserDefinedFields] = useState([]);\n\n  /**\n   * Fetches the user defined fields for the passed defineable ID and defineable type.\n   */\n  useEffect(() => {\n    setLoading(true);\n\n    UserDefinedFieldsService\n      .fetchAll({ defineable_id: defineableId, defineable_type: defineableType })\n      .then(({ data }) => setUserDefinedFields(data.user_defined_fields))\n      .finally(() => setLoading(false));\n  }, [defineableId, defineableId]);\n\n  return {\n    loading,\n    userDefinedFields\n  };\n};\n"],"names":["useUserDefinedColumns","defineableId","defineableType","options","loading","userDefinedFields","useUserDefinedFields","sortable","resolveValue","useCallback","item","field","record","userDefinedColumns","useMemo","columns","_","column","DataTypes","jsx","BooleanIcon","DateUtils","setLoading","useState","setUserDefinedFields","useEffect","UserDefinedFieldsService","data"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAuBO,MAAMA,KAAwB,CAACC,GAAcC,GAAgBC,IAAU,CAAA,MAAO;AACnF,QAAM,EAAE,SAAAC,GAAS,mBAAAC,EAAA,IAAsBC,EAAqBL,GAAcC,CAAc,GAClF,EAAE,UAAAK,IAAW,GAAS,IAAAJ,GAOtBK,IAAeC,EAAY,CAACC,GAAMC,MAAU;AAChD,QAAIC,IAASF;AAMT,WAJAP,EAAQ,kBACDS,IAAAT,EAAQ,cAAcO,CAAI,IAGhCE,EAAO,eAILA,EAAO,aAAaD,EAAM,IAAI,IAH5B;AAAA,EAG4B,GACpC,CAACR,EAAQ,aAAa,CAAC,GAOpBU,IAAqBC,EAAQ,MAAM;AACvC,UAAMC,IAAU,CAAA;AAEd,WAAAC,EAAA,KAAKX,GAAmB,CAACM,MAAU;AACnC,YAAMM,IAAS;AAAA,QACb,MAAMN,EAAM;AAAA,QACZ,OAAOA,EAAM;AAAA,QACb,QAAQ;AAAA,QACR,UAAAJ;AAAA,MAAA;AAGE,MAAAI,EAAM,cAAcO,EAAU,WAChCH,EAAQ,KAAK;AAAA,QACX,GAAGE;AAAA,QACH,QAAQ,CAACP,MACPS,gBAAAA,EAAA;AAAA,UAACC;AAAA,UAAA;AAAA,YACC,OAAOZ,EAAaE,GAAMC,CAAK;AAAA,UAAA;AAAA,QACjC;AAAA,MAAA,CAEH,GAGCA,EAAM,cAAcO,EAAU,QAChCH,EAAQ,KAAK;AAAA,QACX,GAAGE;AAAA,QACH,SAAS,CAACP,MAASW,EAAU,WAAWb,EAAaE,GAAMC,CAAK,CAAC;AAAA,MAAA,CAClE,GAGCA,EAAM,cAAcO,EAAU,YAChCH,EAAQ,KAAK;AAAA,QACX,GAAGE;AAAA,QACH,SAAS,CAACP,MAASF,EAAaE,GAAMC,CAAK;AAAA,MAAA,CAC5C;AAAA,IACH,CACD,GAEMI;AAAA,EAAA,GACN,CAACV,GAAmBG,CAAY,CAAC;AAE7B,SAAA;AAAA,IACL,SAAAJ;AAAA,IACA,oBAAAS;AAAA,EAAA;AAEJ,GAEaP,IAAuB,CAACL,GAAcC,MAAmB;AACpE,QAAM,CAACE,GAASkB,CAAU,IAAIC,EAAS,EAAK,GACtC,CAAClB,GAAmBmB,CAAoB,IAAID,EAAS,CAAE,CAAA;AAK7D,SAAAE,EAAU,MAAM;AACd,IAAAH,EAAW,EAAI,GAGZI,EAAA,SAAS,EAAE,eAAezB,GAAc,iBAAiBC,EAAe,CAAC,EACzE,KAAK,CAAC,EAAE,MAAAyB,QAAWH,EAAqBG,EAAK,mBAAmB,CAAC,EACjE,QAAQ,MAAML,EAAW,EAAK,CAAC;AAAA,EAAA,GACjC,CAACrB,GAAcA,CAAY,CAAC,GAExB;AAAA,IACL,SAAAG;AAAA,IACA,mBAAAC;AAAA,EAAA;AAEJ;"}
+{"version":3,"file":"index.es7.js","sources":["../src/hooks/UserDefinedFields.js"],"sourcesContent":["// @flow\n\nimport { BooleanIcon } from '@performant-software/semantic-components';\nimport { Date as DateUtils } from '@performant-software/shared-components';\nimport React, {\n  useCallback,\n  useEffect,\n  useMemo,\n  useState\n} from 'react';\nimport _ from 'underscore';\nimport { DataTypes } from '../constants/DataTypes';\nimport UserDefinedFieldsService from '../services/UserDefinedFields';\n\n/**\n * Returns the loading state and list of user defined columns for the passed defineable ID and defineable type.\n *\n * @param defineableId\n * @param defineableType\n * @param options\n *\n * @returns {{userDefinedColumns: [], loading: boolean}}\n */\nconst useUserDefinedColumns = (defineableId, defineableType, options = {}) => {\n  const [fields, setFields] = useState([]);\n  const [loading, setLoading] = useState(false);\n\n  const { sortable = true } = options;\n\n  /**\n   * Resolves the user defined field value for the passed item.\n   *\n   * @type {(function(*, *): (null|*))|*}\n   */\n  const resolveValue = useCallback((item, field) => {\n    let record = item;\n\n    if (options.resolveRecord) {\n      record = options.resolveRecord(item);\n    }\n\n    if (!record.user_defined) {\n      return null;\n    }\n\n    return record.user_defined[field.uuid];\n  }, [options.resolveRecord]);\n\n  /**\n   * Memo-izes the columns.\n   *\n   * @type {[]}\n   */\n  const userDefinedColumns = useMemo(() => {\n    const columns = [];\n\n    _.each(fields, (field) => {\n      const column = {\n        name: field.uuid,\n        label: field.column_name,\n        hidden: true,\n        sortable\n      };\n\n      if (field.data_type === DataTypes.boolean) {\n        columns.push({\n          ...column,\n          render: (item) => (\n            <BooleanIcon\n              value={resolveValue(item, field)}\n            />\n          )\n        });\n      }\n\n      if (field.data_type === DataTypes.date) {\n        columns.push({\n          ...column,\n          resolve: (item) => DateUtils.formatDate(resolveValue(item, field))\n        });\n      }\n\n      if (field.data_type !== DataTypes.richText) {\n        columns.push({\n          ...column,\n          resolve: (item) => resolveValue(item, field)\n        });\n      }\n    });\n\n    return columns;\n  }, [fields, resolveValue]);\n\n  /**\n   * Fetches the user defined fields for the passed defineable ID and defineable type.\n   */\n  useEffect(() => {\n    setLoading(true);\n\n    UserDefinedFieldsService\n      .fetchAll({ defineable_id: defineableId, defineable_type: defineableType })\n      .then(({ data }) => setFields(data.user_defined_fields))\n      .finally(() => setLoading(false));\n  }, [defineableId, defineableId]);\n\n  return {\n    loading,\n    userDefinedColumns\n  };\n};\n\nexport default useUserDefinedColumns;\n"],"names":["useUserDefinedColumns","defineableId","defineableType","options","fields","setFields","useState","loading","setLoading","sortable","resolveValue","useCallback","item","field","record","userDefinedColumns","useMemo","columns","_","column","DataTypes","jsx","BooleanIcon","DateUtils","useEffect","UserDefinedFieldsService","data"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAuBA,MAAMA,KAAwB,CAACC,GAAcC,GAAgBC,IAAU,CAAA,MAAO;AAC5E,QAAM,CAACC,GAAQC,CAAS,IAAIC,EAAS,CAAE,CAAA,GACjC,CAACC,GAASC,CAAU,IAAIF,EAAS,EAAK,GAEtC,EAAE,UAAAG,IAAW,GAAS,IAAAN,GAOtBO,IAAeC,EAAY,CAACC,GAAMC,MAAU;AAChD,QAAIC,IAASF;AAMT,WAJAT,EAAQ,kBACDW,IAAAX,EAAQ,cAAcS,CAAI,IAGhCE,EAAO,eAILA,EAAO,aAAaD,EAAM,IAAI,IAH5B;AAAA,EAG4B,GACpC,CAACV,EAAQ,aAAa,CAAC,GAOpBY,IAAqBC,EAAQ,MAAM;AACvC,UAAMC,IAAU,CAAA;AAEd,WAAAC,EAAA,KAAKd,GAAQ,CAACS,MAAU;AACxB,YAAMM,IAAS;AAAA,QACb,MAAMN,EAAM;AAAA,QACZ,OAAOA,EAAM;AAAA,QACb,QAAQ;AAAA,QACR,UAAAJ;AAAA,MAAA;AAGE,MAAAI,EAAM,cAAcO,EAAU,WAChCH,EAAQ,KAAK;AAAA,QACX,GAAGE;AAAA,QACH,QAAQ,CAACP,MACPS,gBAAAA,EAAA;AAAA,UAACC;AAAA,UAAA;AAAA,YACC,OAAOZ,EAAaE,GAAMC,CAAK;AAAA,UAAA;AAAA,QACjC;AAAA,MAAA,CAEH,GAGCA,EAAM,cAAcO,EAAU,QAChCH,EAAQ,KAAK;AAAA,QACX,GAAGE;AAAA,QACH,SAAS,CAACP,MAASW,EAAU,WAAWb,EAAaE,GAAMC,CAAK,CAAC;AAAA,MAAA,CAClE,GAGCA,EAAM,cAAcO,EAAU,YAChCH,EAAQ,KAAK;AAAA,QACX,GAAGE;AAAA,QACH,SAAS,CAACP,MAASF,EAAaE,GAAMC,CAAK;AAAA,MAAA,CAC5C;AAAA,IACH,CACD,GAEMI;AAAA,EAAA,GACN,CAACb,GAAQM,CAAY,CAAC;AAKzB,SAAAc,EAAU,MAAM;AACd,IAAAhB,EAAW,EAAI,GAGZiB,EAAA,SAAS,EAAE,eAAexB,GAAc,iBAAiBC,EAAe,CAAC,EACzE,KAAK,CAAC,EAAE,MAAAwB,QAAWrB,EAAUqB,EAAK,mBAAmB,CAAC,EACtD,QAAQ,MAAMlB,EAAW,EAAK,CAAC;AAAA,EAAA,GACjC,CAACP,GAAcA,CAAY,CAAC,GAExB;AAAA,IACL,SAAAM;AAAA,IACA,oBAAAQ;AAAA,EAAA;AAEJ;"}

package/dist/index.es70.js

@@ -1,4 +1,4 @@
-import o from "./index.es231.js";
+import o from "./index.es244.js";
 const e = o("Symbol");
 export {
   e as default

package/dist/index.es71.js

@@ -1,4 +1,4 @@
-import r from "./index.es231.js";
+import r from "./index.es244.js";
 const f = r("ArrayBuffer");
 export {
   f as default

package/dist/index.es72.js

@@ -1,4 +1,4 @@
-import r from "./index.es231.js";
+import r from "./index.es244.js";
 import i from "./index.es18.js";
 import a from "./index.es71.js";
 import { hasStringTagBug as e } from "./index.es19.js";

package/dist/index.es73.js

@@ -1,5 +1,5 @@
 import { nativeIsArray as r } from "./index.es17.js";
-import t from "./index.es231.js";
+import t from "./index.es244.js";
 const e = r || t("Array");
 export {
   e as default

package/dist/index.es76.js

@@ -1,7 +1,7 @@
 import { supportsArrayBuffer as i, nativeIsView as t, toString as a } from "./index.es17.js";
 import e from "./index.es72.js";
 import o from "./index.es97.js";
-import n from "./index.es233.js";
+import n from "./index.es246.js";
 var s = /\[object ((I|Ui)nt(8|16|32)|Float(32|64)|Uint8Clamped|Big(I|Ui)nt64)Array\]/;
 function f(r) {
   return t ? t(r) && !e(r) : n(r) && s.test(a.call(r));

package/dist/index.es77.js

@@ -1,4 +1,4 @@
-import e from "./index.es234.js";
+import e from "./index.es247.js";
 import i from "./index.es73.js";
 import m from "./index.es65.js";
 import n from "./index.es20.js";

package/dist/index.es79.js

@@ -1,13 +1,13 @@
 import m from "./index.es21.js";
 import { toString as g, SymbolProto as h } from "./index.es17.js";
-import j from "./index.es235.js";
+import j from "./index.es248.js";
 import D from "./index.es76.js";
 import y from "./index.es18.js";
 import { hasStringTagBug as V } from "./index.es19.js";
 import v from "./index.es72.js";
 import w from "./index.es81.js";
-import q from "./index.es232.js";
-import d from "./index.es236.js";
+import q from "./index.es245.js";
+import d from "./index.es249.js";
 var B = "[object DataView]";
 function c(e, r, f, n) {
   if (e === r)

package/dist/index.es80.js

@@ -1,4 +1,4 @@
-import e from "./index.es231.js";
+import e from "./index.es244.js";
 const a = e("WeakSet");
 export {
   a as default

package/dist/index.es81.js

@@ -1,7 +1,7 @@
 import e from "./index.es60.js";
 import { nativeKeys as f, hasEnumBug as m } from "./index.es17.js";
-import n from "./index.es232.js";
-import o from "./index.es238.js";
+import n from "./index.es245.js";
+import o from "./index.es251.js";
 function c(r) {
   if (!e(r))
     return [];

package/dist/index.es82.js

@@ -1,6 +1,6 @@
 import e from "./index.es60.js";
 import { hasEnumBug as f } from "./index.es17.js";
-import i from "./index.es238.js";
+import i from "./index.es251.js";
 function s(r) {
   if (!e(r))
     return [];

package/dist/index.es87.js

@@ -1,4 +1,4 @@
-import e from "./index.es239.js";
+import e from "./index.es252.js";
 import r from "./index.es82.js";
 const s = e(r);
 export {

package/dist/index.es88.js

@@ -1,4 +1,4 @@
-import e from "./index.es239.js";
+import e from "./index.es252.js";
 import r from "./index.es81.js";
 const s = e(r);
 export {

package/dist/index.es89.js

@@ -1,4 +1,4 @@
-import e from "./index.es239.js";
+import e from "./index.es252.js";
 import r from "./index.es82.js";
 const s = e(r, !0);
 export {

package/dist/index.es90.js

@@ -1,4 +1,4 @@
-import a from "./index.es240.js";
+import a from "./index.es253.js";
 import f from "./index.es88.js";
 function i(t, e) {
   var r = a(t);

package/dist/index.es93.js

@@ -1,5 +1,5 @@
-import f from "./index.es241.js";
-import i from "./index.es242.js";
+import f from "./index.es254.js";
+import i from "./index.es255.js";
 import m from "./index.es62.js";
 function d(e, r, o) {
   var t = i(e, f(r));

package/dist/index.es94.js

@@ -1,5 +1,5 @@
-import n from "./index.es232.js";
-import o from "./index.es241.js";
+import n from "./index.es245.js";
+import o from "./index.es254.js";
 function s(t, r) {
   r = o(r);
   for (var a = r.length, f = 0; f < a; f++) {

package/dist/index.es95.js

@@ -1,4 +1,4 @@
-import t from "./index.es243.js";
+import t from "./index.es256.js";
 import v from "./index.es81.js";
 function k(r, f, l) {
   f = t(f, l);

package/dist/index.es99.js

@@ -1,5 +1,5 @@
-import o from "./index.es242.js";
-import e from "./index.es241.js";
+import o from "./index.es255.js";
+import e from "./index.es254.js";
 function u(r) {
   return r = e(r), function(t) {
     return o(t, r);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@performant-software/user-defined-fields",
-  "version": "2.2.3-beta.1",
+  "version": "2.2.3-beta.2",
   "description": "A package of components used for allowing end users to define fields on models. Use with the \"user_defined_fields\" gem.",
   "license": "MIT",
   "main": "./dist/index.cjs.js",
@@ -23,8 +23,8 @@
     "underscore": "^1.13.2"
   },
   "peerDependencies": {
-    "@performant-software/semantic-components": "^2.2.3-beta.1",
-    "@performant-software/shared-components": "^2.2.3-beta.1",
+    "@performant-software/semantic-components": "^2.2.3-beta.2",
+    "@performant-software/shared-components": "^2.2.3-beta.2",
     "react": ">= 16.13.1 < 19.0.0",
     "react-dom": ">= 16.13.1 < 19.0.0"
   },

package/src/hooks/UserDefinedFields.js

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

package/src/index.js

@@ -8,7 +8,7 @@ export { default as UserDefinedFieldsForm } from './components/UserDefinedFields
 export { default as UserDefinedFieldsList } from './components/UserDefinedFieldsList';
 
 // Hooks
-export { useUserDefinedColumns, useUserDefinedFields } from './hooks/UserDefinedFields';
+export { default as useUserDefinedColumns } from './hooks/UserDefinedFields';
 
 // Services
 export { default as UserDefinedFieldsService } from './services/UserDefinedFields';

package/types/hooks/UserDefinedFields.js.flow

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

package/types/index.js.flow

@@ -8,7 +8,7 @@ export { default as UserDefinedFieldsForm } from './components/UserDefinedFields
 export { default as UserDefinedFieldsList } from './components/UserDefinedFieldsList';
 
 // Hooks
-export { useUserDefinedColumns, useUserDefinedFields } from './hooks/UserDefinedFields';
+export { default as useUserDefinedColumns } from './hooks/UserDefinedFields';
 
 // Services
 export { default as UserDefinedFieldsService } from './services/UserDefinedFields';