@bindu-dashing/dam-solution-v2 5.8.72 → 5.8.74

package/build/MyDrive/DriveContainer.js

@@ -76,8 +76,11 @@ function DriveContainer({ parentFolderId, setSelectedFile, setParentFolderId, pi
         return params;
     };
     const hasValidSearch = (globalSearch && globalSearch.length >= 2) || (folderSearch && folderSearch.length >= 2);
-    const shouldFetchInSearchOnlyMode = !searchOnly || hasValidSearch;
-    console.log('## DriveContainer - folderId:', parentFolderId, 'searchOnly:', searchOnly, 'hasValidSearch:', hasValidSearch, 'shouldFetch:', shouldFetchInSearchOnlyMode, 'globalSearch:', globalSearch, 'folderSearch:', folderSearch);
+    // In shopifySearchMode, NEVER fetch from DAM folders API - only use Shopify API
+    // In regular searchOnly mode, fetch only when there's a valid search
+    // In normal mode, always fetch
+    const shouldFetchFromDamApi = shopifySearchMode ? false : (!searchOnly || hasValidSearch);
+    console.log('## DriveContainer - shopifySearchMode:', shopifySearchMode, 'searchOnly:', searchOnly, 'hasValidSearch:', hasValidSearch, 'shouldFetchFromDamApi:', shouldFetchFromDamApi);
     const { data: foldersPaginatedData, isLoading, hasNextPage, fetchNextPage, refetch, isFetching, error, } = useFolders(api, generateFoldersQueryKey(type), merge({}, Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ page: DEFAULT_PAGE }, (type ? { category: type } : {})), (!!imagePicker
         ? {
             includeSubFolders: get(imagePicker, "includeSubFolders", true),
@@ -89,8 +92,9 @@ function DriveContainer({ parentFolderId, setSelectedFile, setParentFolderId, pi
         ? { globalSearch }
         : {})), { sortBy: sortBy, sortOrder: sortOrder }), Object.assign(Object.assign({}, getDateRangeFromKey(selectedDateKey)), (!!selectedType ? { type: selectedType } : {}))), 
     // Priority: parentFolderId (from selection) > folderId (from URL params) > id > rootFolderId
+    // In shopifySearchMode, pass empty string to disable DAM API fetch
     (() => {
-        const computedFolderId = shouldFetchInSearchOnlyMode
+        const computedFolderId = shouldFetchFromDamApi
             ? (parentFolderId
                 ? parentFolderId
                 : folderId
@@ -99,7 +103,7 @@ function DriveContainer({ parentFolderId, setSelectedFile, setParentFolderId, pi
                         ? id
                         : rootFolderId)
             : "";
-        console.log('## useFolders computedFolderId:', computedFolderId, 'shouldFetch:', shouldFetchInSearchOnlyMode);
+        console.log('## useFolders computedFolderId:', computedFolderId, 'shouldFetchFromDamApi:', shouldFetchFromDamApi);
         return computedFolderId;
     })());
     useEffect(() => {
@@ -112,13 +116,15 @@ function DriveContainer({ parentFolderId, setSelectedFile, setParentFolderId, pi
     }, []);
     const folders = useMemo(() => {
         // For shopify search mode, return shopify products instead of DAM folders
-        if (shopifySearchMode && hasValidSearch) {
-            return shopifyProducts;
+        if (shopifySearchMode) {
+            // In Shopify mode, only show products when there's a valid search
+            return hasValidSearch ? shopifyProducts : [];
         }
-        // For searchOnly mode without valid search, return empty array
+        // For regular searchOnly mode without valid search, return empty array
         if (searchOnly && !hasValidSearch) {
             return [];
         }
+        // Normal mode - return DAM folders
         return !!foldersPaginatedData
             ? flatMap(get(foldersPaginatedData, "pages"), "folders")
             : [];
@@ -238,26 +244,27 @@ function DriveContainer({ parentFolderId, setSelectedFile, setParentFolderId, pi
     }, [brandId]);
     // Fetch Shopify products when in shopify search mode
     useEffect(() => {
-        console.log("Shopify search effect - shopifySearchMode:", shopifySearchMode, "coreApiToken:", !!coreApiToken, "folderSearch:", folderSearch);
-        // Only require coreApiToken (not coreApiUrl since we have a fallback)
-        if (shopifySearchMode && coreApiToken && folderSearch && folderSearch.length >= 2) {
+        console.log("Shopify search effect - shopifySearchMode:", shopifySearchMode, "folderSearch:", folderSearch);
+        // Using static token, so no need to check for coreApiToken
+        if (shopifySearchMode && folderSearch && folderSearch.length >= 2) {
             fetchShopifyProducts(folderSearch);
         }
         else if (shopifySearchMode && (!folderSearch || folderSearch.length < 2)) {
             setState((prevState) => (Object.assign(Object.assign({}, prevState), { shopifyProducts: [] })));
         }
-    }, [shopifySearchMode, coreApiToken, folderSearch]);
+    }, [shopifySearchMode, folderSearch]);
     const fetchShopifyProducts = (searchTerm) => __awaiter(this, void 0, void 0, function* () {
         setState((prevState) => (Object.assign(Object.assign({}, prevState), { shopifyLoading: true })));
         try {
-            // Use coreApiUrl if provided, otherwise use staging URL as fallback
+            // Hardcoded Shopify API URL and token for now
             const shopifyApiBaseUrl = "https://staging-api.dashingone.com.au";
+            // Static token for Shopify API access - TODO: Replace with proper auth mechanism later
+            const shopifyStaticToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MTAyOSwicGVybWlzc2lvbnMiOiJbe1wicmVzb3VyY2VfaWRcIjoyLFwiYWNjZXNzXCI6W1wicmVhZFwiXX0se1wicmVzb3VyY2VfaWRcIjoxLFwiYWNjZXNzXCI6W1wicmVhZFwiXX0se1wicmVzb3VyY2VfaWRcIjo1LFwiYWNjZXNzXCI6W1wiY3JlYXRlXCJdfSx7XCJyZXNvdXJjZV9pZFwiOjUsXCJhY2Nlc3NcIjpbXCJyZWFkXCJdfSx7XCJyZXNvdXJjZV9pZFwiOjUsXCJhY2Nlc3NcIjpbXCJ1cGRhdGVcIl19XSIsInRlYW1zIjoiWzE1OCwxNjUsMTA0XSIsInRlYW1JRCI6MTU4LCJicmFuZFRlYW1JRCI6MTA0LCJ0aGVtZUlEIjoxLCJlbWFpbCI6Im1haGVuZHJha29uZGFkYXN1QGdtYWlsLmNvbSIsImZpcnN0TmFtZSI6Ik1haGVuZHJhIiwibGFzdE5hbWUiOiJLb25kYWRhc3UiLCJpYXQiOjE3NjUyNjE1MzIsImV4cCI6MTc2NTMyMTUzMn0.1KcLUytTQQ2cqqOfNwuMt8vIdm1mJMv5mZZtCC9M1KA";
             console.log("Shopify API Base URL:", shopifyApiBaseUrl);
-            console.log("Core API Token available:", !!coreApiToken);
             const response = yield axios.get(`${shopifyApiBaseUrl}${FETCH_SHOPIFY_PRODUCTS_URL}`, {
                 params: { title: searchTerm },
                 headers: {
-                    Authorization: `Bearer ${coreApiToken}`,
+                    Authorization: `Bearer ${shopifyStaticToken}`,
                 },
             });
             // Transform Shopify products to file entity format
@@ -323,7 +330,7 @@ function DriveContainer({ parentFolderId, setSelectedFile, setParentFolderId, pi
                                         const [start, end] = dates;
                                         setState((prev) => (Object.assign(Object.assign({}, prev), { customDateRange: dates, selectedDateKey: "custom" })));
                                     }
-                                }, loading: isFetching, loadingType: loadingType }))] }), _jsx(ToggleView, { showGrid: showGrid, toggleView: (value) => setState((prevState) => (Object.assign(Object.assign({}, prevState), { showGrid: value }))) })] }), _jsx("div", { className: "md-lib-border-b md-lib-border-borderColor md-lib-mb-4" }), searchOnly && !hasValidSearch ? (_jsxs("div", { className: "md-lib-flex md-lib-flex-col md-lib-items-center md-lib-justify-center md-lib-py-16", children: [_jsx(IoIosSearchIcon, { className: "md-lib-text-6xl md-lib-text-borderColor dark:md-lib-text-darkBorderColor md-lib-mb-4" }), _jsx("p", { className: "md-lib-text-sm md-lib-font-semibold md-lib-text-textColor dark:md-lib-text-darkTextColor", children: "Search for files" }), _jsx("p", { className: "md-lib-text-xs md-lib-text-gray-500 md-lib-mt-2", children: "Enter at least 2 characters to search" })] })) : (isLoading || shopifyLoading) ? (_jsx(Loader, {})) : isEmpty(folders) ? (_jsxs("div", { className: "md-lib-flex md-lib-flex-col md-lib-items-center md-lib-justify-center", children: [_jsx("img", { src: NOT_FOUND_IMAGE_URL, alt: "Not Found", width: 300, height: 300 }), _jsx("p", { className: "md-lib-mt-3 md-lib-text-sm md-lib-font-semibold", children: error
+                                }, loading: isFetching, loadingType: loadingType }))] }), _jsx(ToggleView, { showGrid: showGrid, toggleView: (value) => setState((prevState) => (Object.assign(Object.assign({}, prevState), { showGrid: value }))) })] }), _jsx("div", { className: "md-lib-border-b md-lib-border-borderColor md-lib-mb-4" }), searchOnly && !hasValidSearch ? (_jsxs("div", { className: "md-lib-flex md-lib-flex-col md-lib-items-center md-lib-justify-center md-lib-py-16", children: [_jsx(IoIosSearchIcon, { className: "md-lib-text-6xl md-lib-text-borderColor dark:md-lib-text-darkBorderColor md-lib-mb-4" }), _jsx("p", { className: "md-lib-text-sm md-lib-font-semibold md-lib-text-textColor dark:md-lib-text-darkTextColor", children: "Search for files" }), _jsx("p", { className: "md-lib-text-xs md-lib-text-gray-500 md-lib-mt-2", children: "Enter at least 2 characters to search" })] })) : (shopifySearchMode ? shopifyLoading : isLoading) ? (_jsx(Loader, {})) : isEmpty(folders) ? (_jsxs("div", { className: "md-lib-flex md-lib-flex-col md-lib-items-center md-lib-justify-center", children: [_jsx("img", { src: NOT_FOUND_IMAGE_URL, alt: "Not Found", width: 300, height: 300 }), _jsx("p", { className: "md-lib-mt-3 md-lib-text-sm md-lib-font-semibold", children: error
                             ? get(error, "message", SOMETHING_WENT_WRONG)
                             : includes(Object.values(DriveModes), type)
                                 ? "No data found"

package/package.json

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