@bindu-dashing/dam-solution-v2 5.8.73 → 5.8.78

package/build/ImagePicker/TestImagePickerModal.js

@@ -17,8 +17,9 @@ import TestImageFromMetalData from "./TestImgFromMetaData";
 import { getFormattedValue } from "../hocs/helpers";
 import { createApiClient } from "../hocs/configureAxios";
 import { useDamConfig } from "../hocs/DamConfigContext";
-import { FETCH_ASSET_URL, FETCH_SHARED_FILE_URL, } from "../utilities/constants/apiUrls";
+import { FETCH_ASSET_URL, FETCH_SHARED_FILE_URL, FETCH_SHOPIFY_PRODUCT_DETAIL_URL, } from "../utilities/constants/apiUrls";
 import { FoldersProvider } from "../utilities/FoldersContext";
+import axios from "axios";
 function TestImagePickerModal({ imagePicker, open, toggleModal, setSelectedFile, searchOnly, }) {
     const [state, setState] = useState({
         parentFolderId: get(imagePicker, "folderId"),
@@ -29,22 +30,57 @@ function TestImagePickerModal({ imagePicker, open, toggleModal, setSelectedFile,
     const damConfig = useDamConfig();
     const api = useMemo(() => createApiClient(damConfig), [damConfig]);
     const { parentFolderId, fileForConfirmation } = state;
+    // Check if this is a Shopify product (has shopifyProduct data)
+    const isShopifyProduct = !!get(fileForConfirmation, "shopifyProduct");
+    // Extract numeric product ID from Shopify ID format: "gid://shopify/Product/8145266835769" -> "8145266835769"
+    const extractShopifyProductId = (shopifyId) => {
+        if (!shopifyId)
+            return "";
+        const parts = shopifyId.split("/");
+        return parts[parts.length - 1] || shopifyId;
+    };
+    const onSelectShopifyProduct = () => __awaiter(this, void 0, void 0, function* () {
+        try {
+            const shopifyProduct = get(fileForConfirmation, "shopifyProduct", {});
+            const productId = extractShopifyProductId((shopifyProduct === null || shopifyProduct === void 0 ? void 0 : shopifyProduct.id) || get(fileForConfirmation, "_id", ""));
+            console.log("Fetching Shopify product details for:", productId);
+            // Static token for Shopify API access
+            const shopifyStaticToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MTAyOSwicGVybWlzc2lvbnMiOiJbe1wicmVzb3VyY2VfaWRcIjoyLFwiYWNjZXNzXCI6W1wicmVhZFwiXX0se1wicmVzb3VyY2VfaWRcIjoxLFwiYWNjZXNzXCI6W1wicmVhZFwiXX0se1wicmVzb3VyY2VfaWRcIjo1LFwiYWNjZXNzXCI6W1wiY3JlYXRlXCJdfSx7XCJyZXNvdXJjZV9pZFwiOjUsXCJhY2Nlc3NcIjpbXCJyZWFkXCJdfSx7XCJyZXNvdXJjZV9pZFwiOjUsXCJhY2Nlc3NcIjpbXCJ1cGRhdGVcIl19XSIsInRlYW1zIjoiWzE1OCwxNjUsMTA0XSIsInRlYW1JRCI6MTU4LCJicmFuZFRlYW1JRCI6MTA0LCJ0aGVtZUlEIjoxLCJlbWFpbCI6Im1haGVuZHJha29uZGFkYXN1QGdtYWlsLmNvbSIsImZpcnN0TmFtZSI6Ik1haGVuZHJhIiwibGFzdE5hbWUiOiJLb25kYWRhc3UiLCJpYXQiOjE3NjUyNjE1MzIsImV4cCI6MTc2NTMyMTUzMn0.1KcLUytTQQ2cqqOfNwuMt8vIdm1mJMv5mZZtCC9M1KA";
+            const response = yield axios.get(`https://staging-api.dashingone.com.au${FETCH_SHOPIFY_PRODUCT_DETAIL_URL.replace(":productId", productId)}`, {
+                headers: {
+                    Authorization: `Bearer ${shopifyStaticToken}`,
+                },
+            });
+            console.log("Shopify product detail response:", response.data);
+            // Get product data from response
+            const productData = get(response, "data.data", get(response, "data", {}));
+            // Get image URL from image.src
+            const thumbnailUrl = get(productData, "image.src", get(productData, "images[0].src", fileForConfirmation === null || fileForConfirmation === void 0 ? void 0 : fileForConfirmation.thumbnailUrl));
+            // Pass the thumbnail URL and product title as value
+            setSelectedFile(thumbnailUrl, get(productData, "title", ""));
+        }
+        catch (error) {
+            console.error("Error fetching Shopify product details:", error);
+            // Fallback to using existing data
+            setSelectedFile((fileForConfirmation === null || fileForConfirmation === void 0 ? void 0 : fileForConfirmation.thumbnailUrl) || "", get(fileForConfirmation, "shopifyProduct.title", ""));
+        }
+    });
     const onSelectFile = () => __awaiter(this, void 0, void 0, function* () {
-        // console.log(fileForConfirmation);
+        // If it's a Shopify product, use the Shopify API
+        if (isShopifyProduct) {
+            return onSelectShopifyProduct();
+        }
+        // Original DAM file selection logic
         const response = yield api.get(FETCH_SHARED_FILE_URL.replace(":fileId", get(fileForConfirmation, "_id")));
-        // console.log(response);
         const fileData = get(response, "data");
         const assetId = get(fileData, "assetId");
         const assetTypeResponse = yield api.get(FETCH_ASSET_URL.replace(":assetId", assetId));
         const imagePickerOutputFormat = get(assetTypeResponse, "data.imagePickerOutputFormat", []);
         const metadataFields = get(assetTypeResponse, "data.metadataFields", []);
-        // console.log(imagePickerOutputFormat);
         const formattedOutputFormat = imagePickerOutputFormat.map((field) => {
-            // console.log("field", field);
             const metaField = metadataFields.find((item) => (item === null || item === void 0 ? void 0 : item.name) == (field === null || field === void 0 ? void 0 : field.name));
             return Object.assign(Object.assign({}, field), { fieldId: get(metaField, "_id") });
         });
-        // console.log(formattedOutputFormat);
         const value = getFormattedValue(formattedOutputFormat, fileForConfirmation === null || fileForConfirmation === void 0 ? void 0 : fileForConfirmation.s3Url, get(fileData, "metadata", {}));
         console.log(value);
         setSelectedFile(fileForConfirmation === null || fileForConfirmation === void 0 ? void 0 : fileForConfirmation.thumbnailUrl, value);
@@ -59,6 +95,6 @@ function TestImagePickerModal({ imagePicker, open, toggleModal, setSelectedFile,
                     if (localFile) {
                         setSelectedFile(get(file, "s3Url", ""), get(file, "thumbnailUrl", ""));
                     }
-                }, parentFolderId: parentFolderId, setParentFolderId: (id) => setState((prevState) => (Object.assign(Object.assign({}, prevState), { parentFolderId: id, fileForConfirmation: {} }))), pickerFolderId: get(imagePicker, "folderId"), selectedPickerFile: fileForConfirmation, imagePicker: imagePicker, globalSearch: globalSearch, setGlobalSearch: setGlobalSearch, searchOnly: searchOnly }) })) }));
+                }, parentFolderId: parentFolderId, setParentFolderId: (id) => setState((prevState) => (Object.assign(Object.assign({}, prevState), { parentFolderId: id, fileForConfirmation: {} }))), pickerFolderId: get(imagePicker, "folderId"), selectedPickerFile: fileForConfirmation, imagePicker: imagePicker, globalSearch: globalSearch, setGlobalSearch: setGlobalSearch, searchOnly: searchOnly, shopifyMode: searchOnly }) })) }));
 }
 export default TestImagePickerModal;

package/build/MyDrive/DriveContainer.d.ts

@@ -1,6 +1,6 @@
 import { SetStateAction } from "react";
 import { FileEntity, ImagePickerEntity } from "../utilities/constants/interface";
-declare function DriveContainer({ parentFolderId, setSelectedFile, setParentFolderId, pickerFolderId, selectedPickerFile, imagePicker, globalSearch, setGlobalSearch, setSelectedKeys, searchOnly, }: {
+declare function DriveContainer({ parentFolderId, setSelectedFile, setParentFolderId, pickerFolderId, selectedPickerFile, imagePicker, globalSearch, setGlobalSearch, setSelectedKeys, searchOnly, shopifyMode, }: {
     parentFolderId?: string;
     setSelectedFile?: (file: FileEntity, localFile?: boolean) => void;
     setParentFolderId?: (id: string) => void;
@@ -11,5 +11,6 @@ declare function DriveContainer({ parentFolderId, setSelectedFile, setParentFold
     setGlobalSearch?: React.Dispatch<SetStateAction<string>>;
     setSelectedKeys?: (keys: string | string[]) => void;
     searchOnly?: boolean;
+    shopifyMode?: boolean;
 }): JSX.Element;
 export default DriveContainer;

package/build/MyDrive/DriveContainer.js

@@ -37,9 +37,11 @@ import useAppParams from "../utilities/useAppParams";
 import { IoIosSearch } from "react-icons/io";
 const BsUploadIcon = BsUpload;
 const IoIosSearchIcon = IoIosSearch;
-function DriveContainer({ parentFolderId, setSelectedFile, setParentFolderId, pickerFolderId, selectedPickerFile, imagePicker, globalSearch, setGlobalSearch, setSelectedKeys, searchOnly, }) {
+function DriveContainer({ parentFolderId, setSelectedFile, setParentFolderId, pickerFolderId, selectedPickerFile, imagePicker, globalSearch, setGlobalSearch, setSelectedKeys, searchOnly, shopifyMode, }) {
     const damConfig = useDamConfig();
-    const { rootFolderId, brand, isAdmin, coreApiUrl, coreApiToken, shopifySearchMode } = damConfig;
+    const { rootFolderId, brand, isAdmin } = damConfig;
+    // Use shopifyMode prop directly (passed from parent), fallback to context value
+    const shopifySearchMode = shopifyMode || damConfig.shopifySearchMode;
     const brandId = get(brand, "_id");
     const { folderId, type, id } = useAppParams();
     const api = useMemo(() => createApiClient(damConfig), [damConfig]);
@@ -244,26 +246,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
@@ -271,19 +274,26 @@ function DriveContainer({ parentFolderId, setSelectedFile, setParentFolderId, pi
             const products = get(response, "data.data.products", get(response, "data.products", []));
             console.log("Shopify products response:", response.data);
             console.log("Extracted products:", products);
-            const transformedProducts = (Array.isArray(products) ? products : []).map((product) => ({
-                _id: product.id || product._id || `shopify-${Date.now()}-${Math.random()}`,
-                name: product.title || product.name || "Unknown Product",
-                thumbnailUrl: product.image || product.thumbnailUrl || "",
-                s3Url: product.image || product.s3Url || "",
-                type: EntityType.FILE,
-                fileType: "jpeg",
-                createdAt: product.created_at || product.createdAt || new Date().toISOString(),
-                updatedAt: product.updated_at || product.updatedAt || new Date().toISOString(),
-                size: 0,
-                // Keep original product data for reference
-                shopifyProduct: product,
-            }));
+            const transformedProducts = (Array.isArray(products) ? products : []).map((product) => {
+                // Get price from first variant
+                const price = get(product, "variants[0].price", "");
+                const formattedPrice = price ? `$${price}` : "";
+                return {
+                    _id: product.id || product._id || `shopify-${Date.now()}-${Math.random()}`,
+                    name: product.title || product.name || "Unknown Product",
+                    thumbnailUrl: product.image || product.thumbnailUrl || "",
+                    s3Url: product.image || product.s3Url || "",
+                    type: EntityType.FILE,
+                    fileType: "jpeg",
+                    createdAt: product.created_at || product.createdAt || new Date().toISOString(),
+                    updatedAt: product.updated_at || product.updatedAt || new Date().toISOString(),
+                    size: 0,
+                    // Add price as assetName to display it in the grid
+                    assetName: formattedPrice,
+                    // Keep original product data for reference
+                    shopifyProduct: product,
+                };
+            });
             setState((prevState) => (Object.assign(Object.assign({}, prevState), { shopifyProducts: transformedProducts, shopifyLoading: false })));
         }
         catch (error) {

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

@@ -94,3 +94,4 @@ export declare const GET_BASE64_USING_PATH_URL = "/files/blob";
 export declare const FETCH_FILE_DOWNLOAD_LOGS_URL = "/dashboard/download-summary";
 export declare const FETCH_USER_DOWNLOAD_LOGS_URL = "/dashboard/download-summary/user";
 export declare const FETCH_SHOPIFY_PRODUCTS_URL = "/api/products/shopify";
+export declare const FETCH_SHOPIFY_PRODUCT_DETAIL_URL = "/api/products/shopify/:productId";

package/build/utilities/constants/apiUrls.js

@@ -115,3 +115,4 @@ export const FETCH_FILE_DOWNLOAD_LOGS_URL = "/dashboard/download-summary";
 export const FETCH_USER_DOWNLOAD_LOGS_URL = "/dashboard/download-summary/user";
 // Shopify products (external API - uses core API URL)
 export const FETCH_SHOPIFY_PRODUCTS_URL = "/api/products/shopify";
+export const FETCH_SHOPIFY_PRODUCT_DETAIL_URL = "/api/products/shopify/:productId";

package/package.json

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