@hortiview/modulebase 0.0.14106 → 0.0.15687

package/dist/hooks/useEntity.js

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

package/dist/lib/hooks/useEntity.d.ts

@@ -20,7 +20,7 @@ export declare const AllEntitiesTypeResultMap: {
     farm_organizations: string;
     alert_rules: string;
 };
-export declare const useEntity: <K extends HortiviewDataAreaGroup | ModuleDataAreaGroup, E extends HortiviewDataAreaEntity<K>>(group: K, entity: E, enabled?: boolean) => {
+export declare const useEntity: <K extends HortiviewDataAreaGroup | ModuleDataAreaGroup, E extends HortiviewDataAreaEntity<K>>(group: K, entity: E, enabled?: boolean, shouldGetRawData?: boolean) => {
     data: ResultMap<E>[];
     error: Error;
     isError: true;

package/dist/lib/utils/fetches.d.ts

@@ -14,6 +14,14 @@ export declare const getFarmOrgEntities: <T>(moduleId: string, entityId: string)
  * @returns entity to get
  */
 export declare const getModuleDependedEntities: <T>(moduleId: string, entityId: string) => Promise<import('../main').BaseResponse<T>>;
+/**
+ * a fetch function to get a certain MODULEDEPENDED entity from the moduleApi (will be used in useEntity)
+ * the data will be returned in a raw format
+ * @param moduleId
+ * @param entityId
+ * @returns
+ */
+export declare const getModuleDependedEntitiesRaw: <T>(moduleId: string, entityId: string) => Promise<import('../main').BaseResponse<T>>;
 /**
  *  a fetch function to handle GET requests and returns the response.
  * @param endpoint custom endpoint to GET data from

package/dist/utils/fetches.js

@@ -1,21 +1,22 @@
 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 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;
+import { useEnvironmentStore as i } from "../stores/EnvironmentStore.js";
+import { baseMutation as d, baseFetch as o } from "./baseFetches.js";
+const p = (e, t, n = "POST", s, m) => d(e, t, n, s, m), I = (e, t) => r(`FarmOrgEntities/${e}/byId/${t}`), g = (e, t) => r(`ModuleDependentEntities/${e}/byId/${t}`), E = (e, t) => r(`ModuleDependentEntitiesRaw/${e}/byId/${t}`), A = (e, t) => o(`${e}`, {}, t), r = (e) => {
+  const t = i.getState().environment, n = u.getState().organizationId;
   return o(
     `${t?.MODULE_AUTH_API}${t?.API_PREFIX}/${n}/${e}`,
     {}
   );
-}, E = (e) => {
-  const t = r.getState().environment;
+}, M = (e) => {
+  const t = i.getState().environment;
   return o(`${t?.COMMON_API}${t?.API_PREFIX}/${e}`, {});
 };
 export {
-  E as fetchFromCommonApi,
+  M as fetchFromCommonApi,
   A as fetchFromCustomApi,
-  i as fetchFromModuleApi,
+  r as fetchFromModuleApi,
   I as getFarmOrgEntities,
   g as getModuleDependedEntities,
-  d as mutateOnCustomApi
+  E as getModuleDependedEntitiesRaw,
+  p as mutateOnCustomApi
 };

package/dist/utils/helper.js

@@ -24,7 +24,7 @@ const h = /^[v^~<>=]*?(\d+)(?:\.([x*]|\d+)(?:\.([x*]|\d+)(?:\.([x*]|\d+))?(?:-([
 }, g = (r, e) => {
   const n = u(r), t = u(e), i = n.pop(), o = t.pop(), s = l(n, t);
   return s !== 0 ? s : i && o ? l(i.split("."), o.split(".")) : i || o ? i ? -1 : 1 : 0;
-}, p = "0.0.14106", w = (r) => d.every((e) => v(e, r)), v = (r, e) => {
+}, p = "0.0.15687", w = (r) => d.every((e) => v(e, r)), v = (r, e) => {
   if (!e[r]) {
     if (e.throwError)
       return e.throwError(`Missing required prop: ${r}`, 404), !1;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hortiview/modulebase",
   "description": "This is a base module for hortiview",
-  "version": "0.0.14106",
+  "version": "0.0.15687",
   "type": "module",
   "author": "Falk Menge <falk.menge.ext@bayer.com>",
   "contributors": [
@@ -23,8 +23,8 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@hortiview/default-components": "^1.2.0",
-    "@hortiview/shared-components": "^1.4.2",
+    "@hortiview/default-components": "^1.2.1",
+    "@hortiview/shared-components": "^2.0.0",
     "@microsoft/signalr": "^8.0.7",
     "@tanstack/react-query": "^5.67.3",
     "compare-versions": "^6.1.1",