umwd-components 0.1.663 → 0.1.664

package/dist/types/data/services/e-commerce/enduser/get-enduser-me-loader.d.ts

@@ -0,0 +1,9 @@
+export declare function getExtendedEnduserMeLoader(): Promise<{
+    ok: boolean;
+    data: null;
+    error: any;
+} | {
+    ok: boolean;
+    data: any;
+    error: null;
+}>;

package/dist/types/data/services/logistics/dispatcher/get-dispatcher-me-loader.d.ts

@@ -7,4 +7,3 @@ export declare function getExtendedDispatcherMeLoader(): Promise<{
     data: any;
     error: null;
 }>;
-export declare function getDispatcherMeLoader(token: string): Promise<any>;

package/dist/types/index.d.ts

@@ -189,7 +189,6 @@ export { default as EnduserProfileEditForm } from "./components/e-commerce/endus
 export { default as EnduserProfileDisplay } from "./components/e-commerce/enduser/EnduserProfileDisplay";
 export { updateDispatcherProfileAction as updateDispatcherProfileAction } from "./data/actions/logistics/dispatcher/profile-actions";
 export { getExtendedDispatcherMeLoader as getExtendedDispatcherMeLoader } from "./data/services/logistics/dispatcher/get-dispatcher-me-loader";
-export { getDispatcherMeLoader as getDispatcherMeLoader } from "./data/services/logistics/dispatcher/get-dispatcher-me-loader";
 export { TextualAmountUpdater as TextualAmountUpdater } from "./components/common/TextualAmountUpdater";
 export { default as TextualIPOItemUpdater } from "./components/logistics/ipo/TextualIPOItemUpdater";
 export { default as TextualManageIPOForm } from "./components/logistics/ipo/TextualManageIPOForm";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "umwd-components",
-  "version": "0.1.663",
+  "version": "0.1.664",
   "description": "UMWD Component library",
   "main": "dist/src/index.js",
   "module": "dist/src/index.js",

package/src/data/services/e-commerce/enduser/get-enduser-me-loader.ts

@@ -0,0 +1,115 @@
+"use server";
+
+import { getAuthToken } from "../../get-token";
+import qs from "qs";
+import { getStrapiURL } from "../../../../lib/utils";
+import { unstable_noStore as noStore } from "next/cache";
+
+const baseUrl = getStrapiURL();
+
+const query = qs.stringify({
+  populate: {
+    enduser_profile: {
+      populate: {
+        company_address: true,
+        private_address: true,
+        business_credentials: {
+          populate: {
+            vat_validate_response: true,
+            eori_validate_response: true,
+          },
+        },
+      },
+    },
+  },
+});
+
+const roleQuery = qs.stringify({
+  populate: "role",
+});
+
+// used by profile page
+export async function getExtendedEnduserMeLoader() {
+  noStore();
+  const url = new URL("/api/users/me", baseUrl);
+  url.search = query;
+
+  const authToken = await getAuthToken();
+  if (!authToken) return { ok: false, data: null, error: null };
+
+  try {
+    const response = await fetch(url.href, {
+      method: "GET",
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${authToken}`,
+      },
+      cache: "no-cache", // Ensure the response is not cached and revalidated on every render
+    });
+
+    // Check if the response status is not OK (i.e., not in the range 200-299)
+    if (!response.ok) throw new Error(`HTTP error! status: ${response.status}`);
+
+    const data = await response.json();
+
+    // Check if the data contains an error field
+    if (data.error) return { ok: false, data: null, error: data.error };
+
+    // If everything is fine, return the data
+    return { ok: true, data: data, error: null };
+  } catch (error) {
+    console.error("getExtendedEnduserMeLoader Error:", error);
+    return { ok: false, data: null, error: error };
+  }
+}
+
+/* export async function getEnduserMeLoader(token: string) {
+  const url = new URL("/api/users/me", baseUrl);
+  url.search = query;
+
+  try {
+    const response = await fetch(url, {
+      method: "GET",
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${token}`,
+      },
+    });
+    if (!response.ok) throw new Error(`HTTP error! status: ${response.status}`);
+
+    if (response.ok) {
+      return response.json();
+    } else {
+      throw new Error("Failed to fetch Enduser details");
+    }
+  } catch (error) {
+    console.error("getEnduserMeLoader Error:", error);
+    return null;
+  }
+} */
+
+/* export async function getUserRole() {
+  const url = new URL("/api/users/me", baseUrl);
+  url.search = roleQuery;
+
+  const authToken = await getAuthToken();
+  if (!authToken) return { ok: false, data: null, error: null };
+
+  try {
+    const response = await fetch(url.href, {
+      method: "GET",
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${authToken}`,
+      },
+      cache: "no-cache",
+    });
+    if (!response.ok) throw new Error(`HTTP error! status: ${response.status}`);
+    const data = await response.json();
+    if (data.error) return { ok: false, data: null, error: data.error };
+    return { ok: true, data: data, error: null };
+  } catch (error) {
+    console.error("getUserRole Error:", error);
+    return { ok: false, data: null, error: error };
+  }
+} */

package/src/data/services/logistics/dispatcher/get-dispatcher-me-loader.ts

@@ -62,7 +62,7 @@ export async function getExtendedDispatcherMeLoader() {
   }
 }
 
-export async function getDispatcherMeLoader(token: string) {
+/* export async function getDispatcherMeLoader(token: string) {
   const url = new URL("/api/users/me", baseUrl);
   url.search = query;
 
@@ -85,7 +85,7 @@ export async function getDispatcherMeLoader(token: string) {
     console.error("getDispatcherMeLoader Error:", error);
     return null;
   }
-}
+} */
 
 /* export async function getUserRole() {
   const url = new URL("/api/users/me", baseUrl);

package/src/index.ts

@@ -294,7 +294,7 @@ export { default as EnduserProfileDisplay } from "./components/e-commerce/enduse
 
 export { updateDispatcherProfileAction as updateDispatcherProfileAction } from "./data/actions/logistics/dispatcher/profile-actions";
 export { getExtendedDispatcherMeLoader as getExtendedDispatcherMeLoader } from "./data/services/logistics/dispatcher/get-dispatcher-me-loader";
-export { getDispatcherMeLoader as getDispatcherMeLoader } from "./data/services/logistics/dispatcher/get-dispatcher-me-loader";
+// export { getDispatcherMeLoader as getDispatcherMeLoader } from "./data/services/logistics/dispatcher/get-dispatcher-me-loader";
 
 export { TextualAmountUpdater as TextualAmountUpdater } from "./components/common/TextualAmountUpdater";