@bindu-dashing/dam-solution-v2 5.8.133 → 5.8.134

package/build/hocs/DamConfigContext.js

@@ -12,7 +12,7 @@ import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import { createContext, useContext, useState, useEffect } from "react";
 import { USER_LOGIN, FETCH_TEAMS_LIST, } from "../utilities/constants/apiUrls";
 import axios from "axios";
-import { getBaseUrl, getTeamIDFromToken } from "./helpers";
+import { getBaseUrl, getTeamIDFromToken, getTeamsApiBaseUrl } from "./helpers";
 import { get } from "lodash";
 import Loader from "../common/loader/loader";
 import { SUBSCRIPTION_EXPIRED_ERROR_MESSAGE } from "./appConstants";
@@ -63,7 +63,7 @@ export const DamConfigProvider = ({ children, config }) => {
         }
     });
     const getTeams = (token) => __awaiter(void 0, void 0, void 0, function* () {
-        var _a;
+        var _a, _b, _c, _d;
         if (!token) {
             console.log("No token available to fetch teams");
             return;
@@ -74,20 +74,35 @@ export const DamConfigProvider = ({ children, config }) => {
                 console.log("Could not extract teamID from token");
                 return;
             }
-            // Call the new API endpoint using base URL
+            // Get the Teams API base URL (different from MIXDRIVE_API_URL)
+            const teamsApiBaseUrl = getTeamsApiBaseUrl(appType);
             const teamsEndpoint = FETCH_TEAMS_LIST.replace(":teamID", teamID.toString());
-            const response = yield axios.get(getBaseUrl(appType) + teamsEndpoint, {
+            const fullUrl = teamsApiBaseUrl + teamsEndpoint;
+            console.log("Fetching teams from:", fullUrl);
+            console.log("TeamID from token:", teamID);
+            // Call the new API endpoint using Teams API base URL
+            const response = yield axios.get(fullUrl, {
                 headers: {
                     Authorization: `Bearer ${token}`,
                 },
             });
+            console.log("Teams API response:", response === null || response === void 0 ? void 0 : response.data);
             // Set teams from the API response
             // Assuming the response structure is { data: [...] } or similar
             const teamsData = ((_a = response === null || response === void 0 ? void 0 : response.data) === null || _a === void 0 ? void 0 : _a.data) || (response === null || response === void 0 ? void 0 : response.data) || [];
+            console.log("Parsed teams data:", teamsData);
             setTeams(Array.isArray(teamsData) ? teamsData : []);
         }
         catch (err) {
-            console.log("Error fetching teams:", err);
+            console.error("Error fetching teams:", err);
+            console.error("Error details:", {
+                message: err === null || err === void 0 ? void 0 : err.message,
+                response: (_b = err === null || err === void 0 ? void 0 : err.response) === null || _b === void 0 ? void 0 : _b.data,
+                status: (_c = err === null || err === void 0 ? void 0 : err.response) === null || _c === void 0 ? void 0 : _c.status,
+                url: (_d = err === null || err === void 0 ? void 0 : err.config) === null || _d === void 0 ? void 0 : _d.url,
+            });
+            // Set empty array on error to prevent stale data
+            setTeams([]);
         }
     });
     useEffect(() => {

package/build/hocs/helpers.d.ts

@@ -9,6 +9,13 @@ export declare const getDateRangeFromKey: (key: string) => {
     endDate?: string;
 };
 export declare const getBaseUrl: (appType: string) => string;
+/**
+ * Get the Teams API base URL from environment variable
+ * Falls back to extracting from REACT_APP_TEAMS_API_URL if available
+ * @param appType Application type (reactJs or nextJs)
+ * @returns Teams API base URL
+ */
+export declare const getTeamsApiBaseUrl: (appType: string) => string;
 export declare const getRelativeTime: (timestamp: string) => string;
 export declare const getReadableFileType: (file: FileEntity) => string;
 export declare const humanFileSize: (size: any) => any;

package/build/hocs/helpers.js

@@ -102,6 +102,34 @@ export const getBaseUrl = (appType) => {
             return process.env.REACT_APP_MIXDRIVE_API_URL || "";
     }
 };
+/**
+ * Get the Teams API base URL from environment variable
+ * Falls back to extracting from REACT_APP_TEAMS_API_URL if available
+ * @param appType Application type (reactJs or nextJs)
+ * @returns Teams API base URL
+ */
+export const getTeamsApiBaseUrl = (appType) => {
+    // Check for explicit teams API base URL
+    const teamsApiUrl = appType === "reactJs"
+        ? process.env.REACT_APP_TEAMS_API_URL
+        : process.env.NEXT_PUBLIC_TEAMS_API_URL;
+    if (teamsApiUrl) {
+        // Extract base URL from full URL (remove /teams/:teamID/list part)
+        // Example: https://f5ubolirub.execute-api.ap-southeast-2.amazonaws.com/dev/api/v1/teams/104/list
+        // Should become: https://f5ubolirub.execute-api.ap-southeast-2.amazonaws.com/dev/api/v1
+        const match = teamsApiUrl.match(/^(https?:\/\/[^\/]+(?:\/[^\/]+)*\/api\/v1)/);
+        if (match) {
+            return match[1];
+        }
+        // If pattern doesn't match, try to remove /teams/... part
+        const teamsIndex = teamsApiUrl.indexOf('/teams/');
+        if (teamsIndex !== -1) {
+            return teamsApiUrl.substring(0, teamsIndex);
+        }
+    }
+    // Fallback: use the hardcoded base URL
+    return "https://f5ubolirub.execute-api.ap-southeast-2.amazonaws.com/dev/api/v1";
+};
 export const getRelativeTime = (timestamp) => {
     const now = new Date();
     const created = new Date(timestamp);

package/build/utilities/constants/apiUrls.d.ts

@@ -81,7 +81,7 @@ export declare const FETCH_CLIENT_KEY_URL = "/keys/:keyId";
 export declare const GENERATE_CLIENT_KEY_URL = "/keys/:keyId/generate";
 export declare const USER_LOGIN = "/users/login/keys";
 export declare const FETCH_BRAND_USING_SUBDOMAIN = "/brands/subdomain";
-export declare const FETCH_TEAMS_LIST = "/api/v1/teams/:teamID/list";
+export declare const FETCH_TEAMS_LIST = "/teams/:teamID/list";
 export declare const CREATE_SUB_BRAND = "/brands/sub-brand";
 export declare const FETCH_IMAGEPICKERS_URL = "/image-picker";
 export declare const FETCH_IMAGEPICKER_URL = "/image-picker/:id";

package/build/utilities/constants/apiUrls.js

@@ -96,7 +96,7 @@ export const GENERATE_CLIENT_KEY_URL = "/keys/:keyId/generate";
 // login
 export const USER_LOGIN = "/users/login/keys";
 export const FETCH_BRAND_USING_SUBDOMAIN = "/brands/subdomain";
-export const FETCH_TEAMS_LIST = "/api/v1/teams/:teamID/list";
+export const FETCH_TEAMS_LIST = "/teams/:teamID/list";
 // brand
 export const CREATE_SUB_BRAND = "/brands/sub-brand";
 //image picker

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bindu-dashing/dam-solution-v2",
-  "version": "5.8.133",
+  "version": "5.8.134",
   "dependencies": {
     "@ant-design/icons": "^5.0.1",
     "@emoji-mart/data": "^1.2.1",