@hortiview/modulebase 0.0.12628 → 0.0.13075

package/dist/hooks/useEntity.js

@@ -1,64 +1,67 @@
-import { u as l } from "../useQuery-CwwWze9O.js";
-import { useMemo as g } from "react";
-import { useBasePropsStore as p } from "../stores/BasePropsStore.js";
-import { universalSelector as y } from "../types/Requests.js";
-import { getModuleDependedEntities as R, getFarmOrgEntities as k } from "../utils/fetches.js";
-import { useOption as E, useModuleDependency as D } from "./useOption.js";
-const F = {
+import { u as f } from "../useQuery-CwwWze9O.js";
+import { useMemo as p } from "react";
+import { useBasePropsStore as y } from "../stores/BasePropsStore.js";
+import { universalSelector as E } from "../types/Requests.js";
+import { getModuleDependedEntities as g, getFarmOrgEntities as R } from "../utils/fetches.js";
+import { useOption as M, useModuleDependency as k } from "./useOption.js";
+const D = {
   farms: "farm",
   fields: "field",
   zones: "block",
   irrigation_stations: "irrigationStation",
   farm_organizations: "farmOrg",
   alert_rules: "farmAlertRule"
-}, Q = {
+}, F = {
   farm_members: "member"
-}, q = {
+}, Q = {
   Season: "season",
   BlockPlantLayout: "blockPlantLayout"
-}, A = {
+}, q = {
+  ...D,
   ...F,
-  ...Q,
-  ...q
-}, K = (e, t, a = !0) => {
-  const o = p((r) => r.moduleId), d = p((r) => r.organizationId), { data: u } = E("DataAreaGroup"), { data: i } = E("DataAreaEntity"), { data: n } = D(e === "ModuleDepended"), m = e === "ModuleDepended", M = g(() => {
-    if (m)
-      return n ? n.find((s) => s.registeredEntityName === t)?.id : void 0;
+  ...Q
+}, K = (t, e, a = !0) => {
+  const o = y((n) => n.moduleId), c = y((n) => n.organizationId), { data: u } = M("DataAreaGroup"), { data: i } = M("DataAreaEntity"), { data: s } = k(t === "ModuleDepended"), d = t === "ModuleDepended", b = p(() => {
+    if (d)
+      return s ? s.find((r) => r.registeredEntityName === e)?.id : void 0;
     if (!u || !i) return;
-    const r = u.find((s) => s.key === e)?.id;
-    return r ? i.find((s) => s.description === r && s.value === t)?.id : void 0;
-  }, [m, u, i, n, t, e]), f = O(
+    const n = u.find((r) => r.key === t)?.id;
+    return n ? i.find((r) => r.description === n && r.value === e)?.id : void 0;
+  }, [d, u, i, s, e, t]), l = A(
     o,
-    M,
+    b,
+    c,
     d,
-    m,
     a
-  ), b = (f.data ?? []).map((r) => {
-    const c = A[t];
-    return r[c];
-  });
-  return {
-    ...f,
-    data: b
-  };
-}, O = (e, t, a, o, d = !0) => {
-  const u = l({
-    queryKey: [e, a, t],
-    queryFn: () => R(e ?? "", t ?? ""),
-    enabled: d && o && !!e && !!t && !!a,
-    select: (n) => y(n)
-  }), i = l({
-    queryKey: [e, a, t],
-    queryFn: () => k(e ?? "", t ?? ""),
-    enabled: d && !o && !!e && !!t && !!a,
-    select: (n) => y(n)
+  );
+  return p(() => {
+    const n = (l.data ?? []).map((m) => {
+      const r = q[e];
+      return m[r];
+    });
+    return {
+      ...l,
+      data: n
+    };
+  }, [e, l, d]);
+}, A = (t, e, a, o, c = !0) => {
+  const u = f({
+    queryKey: [t, a, e],
+    queryFn: () => g(t ?? "", e ?? ""),
+    enabled: c && o && !!t && !!e && !!a,
+    select: (s) => E(s)
+  }), i = f({
+    queryKey: [t, a, e],
+    queryFn: () => R(t ?? "", e ?? ""),
+    enabled: c && !o && !!t && !!e && !!a,
+    select: (s) => E(s)
   });
   return o ? u : i;
 };
 export {
-  A as AllEntitiesTypeResultMap,
-  Q as FarmMemberEntitiesTypeResultMap,
-  F as FarmOrgEntitiesTypeResultMap,
-  q as ModuleDependedEntityTypeResultMap,
+  q as AllEntitiesTypeResultMap,
+  F as FarmMemberEntitiesTypeResultMap,
+  D as FarmOrgEntitiesTypeResultMap,
+  Q as ModuleDependedEntityTypeResultMap,
   K as useEntity
 };

package/dist/types/ModuleApi.d.ts

@@ -77,11 +77,11 @@ export interface Field {
     farmId: string;
     name: string;
     description: string;
-    fieldTechnologyId: string;
-    fieldCoverageId: string;
-    fieldShadingId: string;
-    fieldSowingId: string;
-    fieldSubstrateId: string;
+    fieldTechnologyTypeId: string;
+    fieldCoverageTypeId: string;
+    fieldShadingTypeId: string;
+    fieldSowingTypeId: string;
+    fieldSubstrateTypeId: string;
     length: number | null;
     width: number | null;
     rows: number | null;

package/dist/utils/fetches.js

@@ -1,21 +1,21 @@
 import { useBasePropsStore as u } from "../stores/BasePropsStore.js";
 import { useEnvironmentStore as r } from "../stores/EnvironmentStore.js";
 import { baseMutation as c, baseFetch as o } from "./baseFetches.js";
-const g = (e, t, n = "POST", m, s) => c(e, t, n, m, s), A = (e, t) => i(`getAllFarmOrgEntities/${e}/${t}`), d = (e, t) => i(`ModuleDependedEntities/${e}/${t}`), E = (e, t) => o(`${e}`, {}, t), i = (e) => {
+const d = (e, t, n = "POST", m, s) => c(e, t, n, m, s), I = (e, t) => i(`FarmOrgEntities/${e}/byId/${t}`), g = (e, t) => i(`ModuleDependentEntities/${e}/byId/${t}`), A = (e, t) => o(`${e}`, {}, t), i = (e) => {
   const t = r.getState().environment, n = u.getState().organizationId;
   return o(
     `${t?.MODULE_AUTH_API}${t?.API_PREFIX}/${n}/${e}`,
     {}
   );
-}, F = (e) => {
+}, E = (e) => {
   const t = r.getState().environment;
   return o(`${t?.COMMON_API}${t?.API_PREFIX}/${e}`, {});
 };
 export {
-  F as fetchFromCommonApi,
-  E as fetchFromCustomApi,
+  E as fetchFromCommonApi,
+  A as fetchFromCustomApi,
   i as fetchFromModuleApi,
-  A as getFarmOrgEntities,
-  d as getModuleDependedEntities,
-  g as mutateOnCustomApi
+  I as getFarmOrgEntities,
+  g as getModuleDependedEntities,
+  d as mutateOnCustomApi
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hortiview/modulebase",
   "description": "This is a base module for hortiview",
-  "version": "0.0.12628",
+  "version": "0.0.13075",
   "type": "module",
   "author": "Falk Menge <falk.menge.ext@bayer.com>",
   "contributors": [