@pixelated-tech/components 3.14.4 → 3.15.0

package/dist/components/integrations/contentful.delivery.js

@@ -1,4 +1,6 @@
 import PropTypes from "prop-types";
+import { smartFetch } from '../general/smartfetch';
+import { buildUrl } from '../general/urlbuilder';
 const debug = false;
 const ctfQSParams = "?fm=webp&q=50";
 /* ========== CALL CONTENTFUL DELIVERY API ========== */
@@ -15,11 +17,7 @@ export async function callContentfulDeliveryAPI(props) {
     if (debug)
         console.log("Calling Contentful Delivery API:", props.full_url);
     try {
-        const response = await fetch(props.full_url);
-        if (!response.ok) {
-            throw new Error(`Response status: ${response.status}`);
-        }
-        const json = await response.json();
+        const json = await smartFetch(props.full_url);
         return json;
     }
     catch (error) {
@@ -60,11 +58,11 @@ getContentfulEntries.propTypes = {
 };
 export async function getContentfulEntries(props) {
     const { base_url, space_id, environment, delivery_access_token } = props.apiProps;
-    // const full_url = base_url + "/spaces/" + space_id + "/environments/" + environment + "/content_types/" + contentType + "?access_token=" + access_token ;
-    const full_url = base_url +
-        "/spaces/" + space_id +
-        "/environments/" + environment +
-        "/entries?access_token=" + delivery_access_token;
+    const full_url = buildUrl({
+        baseUrl: base_url,
+        pathSegments: ['spaces', space_id, 'environments', environment, 'entries'],
+        params: { access_token: delivery_access_token }
+    });
     return await callContentfulDeliveryAPI({ full_url });
 }
 /*
@@ -124,11 +122,14 @@ getContentfulContentType.propTypes = {
 };
 export async function getContentfulContentType(props) {
     const { base_url, space_id, environment, access_token } = props.apiProps;
-    const full_url = base_url +
-        "/spaces/" + space_id +
-        "/environments/" + environment +
-        "/content_types/" + props.contentType +
-        "?access_token=" + access_token;
+    if (!base_url || !space_id || !environment) {
+        throw new Error('Contentful API properties not configured: base_url, space_id, or environment');
+    }
+    const full_url = buildUrl({
+        baseUrl: base_url,
+        pathSegments: ['spaces', space_id, 'environments', environment, 'content_types', props.contentType],
+        params: { access_token }
+    });
     return await callContentfulDeliveryAPI({ full_url });
 }
 /* ========== GET CONTENTFUL ENTRY BY ENTRY ID ========== */
@@ -152,11 +153,14 @@ getContentfulEntryByEntryID.propTypes = {
 };
 export async function getContentfulEntryByEntryID(props) {
     const { base_url, space_id, environment, delivery_access_token } = props.apiProps;
-    const full_url = base_url +
-        "/spaces/" + space_id +
-        "/environments/" + environment +
-        "/entries/" + props.entry_id +
-        "?access_token=" + delivery_access_token;
+    if (!base_url || !space_id || !environment) {
+        throw new Error('Contentful API properties not configured: base_url, space_id, or environment');
+    }
+    const full_url = buildUrl({
+        baseUrl: base_url,
+        pathSegments: ['spaces', space_id, 'environments', environment, 'entries', props.entry_id],
+        params: { access_token: delivery_access_token }
+    });
     return await callContentfulDeliveryAPI({ full_url });
 }
 /* ========== GET CONTENTFUL CARD BY FIELD ========== */

package/dist/components/integrations/contentful.management.js

@@ -3,22 +3,27 @@
  *
  * Provides reusable CRUD operations for any Contentful content type
  */
+import { smartFetch } from '../general/smartfetch';
+import { buildUrl } from '../general/urlbuilder';
 /**
  * List all entries of a specific content type
  */
 export async function listEntries(contentType, config) {
-    const { space_id, delivery_access_token, environment = 'master' } = config;
+    const { space_id, management_access_token, environment = 'master' } = config;
     try {
-        const response = await fetch(`https://api.contentful.com/spaces/${space_id}/environments/${environment}/entries?content_type=${contentType}`, {
-            headers: {
-                'Authorization': `Bearer ${delivery_access_token}`,
-                'Content-Type': 'application/json',
-            },
+        const url = buildUrl({
+            baseUrl: 'https://api.contentful.com',
+            pathSegments: ['spaces', space_id, 'environments', environment, 'entries'],
+            params: { content_type: contentType }
+        });
+        const data = await smartFetch(url, {
+            requestInit: {
+                headers: {
+                    'Authorization': `Bearer ${management_access_token}`,
+                    'Content-Type': 'application/json',
+                },
+            }
         });
-        if (!response.ok) {
-            throw new Error(`Contentful API error: ${response.status}`);
-        }
-        const data = await response.json();
         const entries = data.items || [];
         return {
             success: true,
@@ -37,30 +42,32 @@ export async function listEntries(contentType, config) {
  * Get a single entry by ID
  */
 export async function getEntryById(entryId, config) {
-    const { space_id, delivery_access_token, environment = 'master' } = config;
+    const { space_id, management_access_token, environment = 'master' } = config;
     try {
-        const response = await fetch(`https://api.contentful.com/spaces/${space_id}/environments/${environment}/entries/${entryId}`, {
-            headers: {
-                'Authorization': `Bearer ${delivery_access_token}`,
-                'Content-Type': 'application/json',
-            },
+        const url = buildUrl({
+            baseUrl: 'https://api.contentful.com',
+            pathSegments: ['spaces', space_id, 'environments', environment, 'entries', entryId]
         });
-        if (!response.ok) {
-            if (response.status === 404) {
-                return {
-                    success: false,
-                    message: 'Entry not found.',
-                };
+        const entry = await smartFetch(url, {
+            requestInit: {
+                headers: {
+                    'Authorization': `Bearer ${management_access_token}`,
+                    'Content-Type': 'application/json',
+                },
             }
-            throw new Error(`Contentful API error: ${response.status}`);
-        }
-        const entry = await response.json();
+        });
         return {
             success: true,
             entry,
         };
     }
     catch (error) {
+        if (error.status === 404) {
+            return {
+                success: false,
+                message: 'Entry not found.',
+            };
+        }
         return {
             success: false,
             message: `Failed to get entry: ${error}`,
@@ -71,22 +78,25 @@ export async function getEntryById(entryId, config) {
  * Search for entries by field value
  */
 export async function searchEntriesByField(contentType, fieldName, fieldValue, config) {
-    const { space_id, delivery_access_token, environment = 'master' } = config;
+    const { space_id, management_access_token, environment = 'master' } = config;
     try {
-        const response = await fetch(`https://api.contentful.com/spaces/${space_id}/environments/${environment}/entries?content_type=${contentType}&fields.${fieldName}=${encodeURIComponent(fieldValue)}`, {
-            headers: {
-                'Authorization': `Bearer ${delivery_access_token}`,
-                'Content-Type': 'application/json',
-            },
+        const url = buildUrl({
+            baseUrl: 'https://api.contentful.com',
+            pathSegments: ['spaces', space_id, 'environments', environment, 'entries'],
+            params: { content_type: contentType, [`fields.${fieldName}`]: fieldValue }
         });
-        if (!response.ok) {
-            throw new Error(`Contentful API error: ${response.status}`);
-        }
-        const data = await response.json();
-        const entries = data.items || [];
+        const entries = await smartFetch(url, {
+            requestInit: {
+                headers: {
+                    'Authorization': `Bearer ${management_access_token}`,
+                    'Content-Type': 'application/json',
+                },
+            }
+        });
+        const items = entries.items || [];
         return {
             success: true,
-            entries,
+            entries: items,
         };
     }
     catch (error) {
@@ -101,43 +111,50 @@ export async function searchEntriesByField(contentType, fieldName, fieldValue, c
  * Create a new entry
  */
 export async function createEntry(contentType, fields, config, autoPublish = true) {
-    const { space_id, delivery_access_token, environment = 'master' } = config;
+    const { space_id, management_access_token, environment = 'master' } = config;
     try {
         // Convert fields to Contentful format (with 'en-US' locale)
         const contentfulFields = {};
         for (const [key, value] of Object.entries(fields)) {
             contentfulFields[key] = { 'en-US': value };
         }
-        const createResponse = await fetch(`https://api.contentful.com/spaces/${space_id}/environments/${environment}/entries`, {
-            method: 'POST',
-            headers: {
-                'Authorization': `Bearer ${delivery_access_token}`,
-                'Content-Type': 'application/vnd.contentful.management.v1+json',
-                'X-Contentful-Content-Type': contentType,
-            },
-            body: JSON.stringify({
-                fields: contentfulFields,
-            }),
+        const url = buildUrl({
+            baseUrl: 'https://api.contentful.com',
+            pathSegments: ['spaces', space_id, 'environments', environment, 'entries']
         });
-        if (!createResponse.ok) {
-            const error = await createResponse.json();
-            throw new Error(`Create failed: ${JSON.stringify(error)}`);
-        }
-        const newEntry = await createResponse.json();
-        // Publish if requested
-        if (autoPublish) {
-            await fetch(`https://api.contentful.com/spaces/${space_id}/environments/${environment}/entries/${newEntry.sys.id}/published`, {
-                method: 'PUT',
+        const data = await smartFetch(url, {
+            requestInit: {
+                method: 'POST',
                 headers: {
-                    'Authorization': `Bearer ${delivery_access_token}`,
-                    'X-Contentful-Version': newEntry.sys.version.toString(),
+                    'Authorization': `Bearer ${management_access_token}`,
+                    'Content-Type': 'application/vnd.contentful.management.v1+json',
+                    'X-Contentful-Content-Type': contentType,
                 },
+                body: JSON.stringify({
+                    fields: contentfulFields,
+                }),
+            }
+        });
+        // Publish if requested
+        if (autoPublish) {
+            const publishUrl = buildUrl({
+                baseUrl: 'https://api.contentful.com',
+                pathSegments: ['spaces', space_id, 'environments', environment, 'entries', data.sys.id, 'published']
+            });
+            await smartFetch(publishUrl, {
+                requestInit: {
+                    method: 'PUT',
+                    headers: {
+                        'Authorization': `Bearer ${management_access_token}`,
+                        'X-Contentful-Version': data.sys.version.toString(),
+                    },
+                }
             });
         }
         return {
             success: true,
             message: 'Entry created successfully.',
-            entryId: newEntry.sys.id,
+            entryId: data.sys.id,
         };
     }
     catch (error) {
@@ -151,7 +168,7 @@ export async function createEntry(contentType, fields, config, autoPublish = tru
  * Update an existing entry
  */
 export async function updateEntry(entryId, fields, config, autoPublish = true) {
-    const { space_id, delivery_access_token, environment = 'master' } = config;
+    const { space_id, management_access_token, environment = 'master' } = config;
     try {
         // Get current entry to get version
         const getResponse = await getEntryById(entryId, config);
@@ -167,30 +184,35 @@ export async function updateEntry(entryId, fields, config, autoPublish = true) {
         for (const [key, value] of Object.entries(fields)) {
             contentfulFields[key] = { 'en-US': value };
         }
-        const updateResponse = await fetch(`https://api.contentful.com/spaces/${space_id}/environments/${environment}/entries/${entryId}`, {
-            method: 'PUT',
-            headers: {
-                'Authorization': `Bearer ${delivery_access_token}`,
-                'Content-Type': 'application/vnd.contentful.management.v1+json',
-                'X-Contentful-Version': currentEntry.sys.version.toString(),
-            },
-            body: JSON.stringify({
-                fields: contentfulFields,
-            }),
-        });
-        if (!updateResponse.ok) {
-            const error = await updateResponse.json();
-            throw new Error(`Update failed: ${JSON.stringify(error)}`);
-        }
-        const updatedEntry = await updateResponse.json();
-        // Publish if requested
-        if (autoPublish) {
-            await fetch(`https://api.contentful.com/spaces/${space_id}/environments/${environment}/entries/${entryId}/published`, {
+        const updatedEntry = await smartFetch(buildUrl({
+            baseUrl: 'https://api.contentful.com',
+            pathSegments: ['spaces', space_id, 'environments', environment, 'entries', entryId],
+        }), {
+            requestInit: {
                 method: 'PUT',
                 headers: {
-                    'Authorization': `Bearer ${delivery_access_token}`,
-                    'X-Contentful-Version': updatedEntry.sys.version.toString(),
+                    'Authorization': `Bearer ${management_access_token}`,
+                    'Content-Type': 'application/vnd.contentful.management.v1+json',
+                    'X-Contentful-Version': currentEntry.sys.version.toString(),
                 },
+                body: JSON.stringify({
+                    fields: contentfulFields,
+                }),
+            }
+        });
+        // Publish if requested
+        if (autoPublish) {
+            await smartFetch(buildUrl({
+                baseUrl: 'https://api.contentful.com',
+                pathSegments: ['spaces', space_id, 'environments', environment, 'entries', entryId, 'published'],
+            }), {
+                requestInit: {
+                    method: 'PUT',
+                    headers: {
+                        'Authorization': `Bearer ${management_access_token}`,
+                        'X-Contentful-Version': updatedEntry.sys.version.toString(),
+                    },
+                }
             });
         }
         return {
@@ -210,7 +232,7 @@ export async function updateEntry(entryId, fields, config, autoPublish = true) {
  * Delete an entry (unpublish first, then delete)
  */
 export async function deleteEntry(entryId, config) {
-    const { space_id, delivery_access_token, environment = 'master' } = config;
+    const { space_id, management_access_token, environment = 'master' } = config;
     try {
         // Get current entry to get version
         const getResponse = await getEntryById(entryId, config);
@@ -222,24 +244,31 @@ export async function deleteEntry(entryId, config) {
         }
         const entry = getResponse.entry;
         // Unpublish first
-        await fetch(`https://api.contentful.com/spaces/${space_id}/environments/${environment}/entries/${entry.sys.id}/published`, {
-            method: 'PUT',
-            headers: {
-                'Authorization': `Bearer ${delivery_access_token}`,
-                'X-Contentful-Version': entry.sys.version.toString(),
-            },
+        await smartFetch(buildUrl({
+            baseUrl: 'https://api.contentful.com',
+            pathSegments: ['spaces', space_id, 'environments', environment, 'entries', entry.sys.id, 'published'],
+        }), {
+            requestInit: {
+                method: 'PUT',
+                headers: {
+                    'Authorization': `Bearer ${management_access_token}`,
+                    'X-Contentful-Version': entry.sys.version.toString(),
+                },
+            }
         });
         // Delete the entry
-        const deleteResponse = await fetch(`https://api.contentful.com/spaces/${space_id}/environments/${environment}/entries/${entryId}`, {
-            method: 'DELETE',
-            headers: {
-                'Authorization': `Bearer ${delivery_access_token}`,
-                'X-Contentful-Version': (entry.sys.version + 1).toString(),
-            },
+        await smartFetch(buildUrl({
+            baseUrl: 'https://api.contentful.com',
+            pathSegments: ['spaces', space_id, 'environments', environment, 'entries', entryId],
+        }), {
+            requestInit: {
+                method: 'DELETE',
+                headers: {
+                    'Authorization': `Bearer ${management_access_token}`,
+                    'X-Contentful-Version': (entry.sys.version + 1).toString(),
+                },
+            }
         });
-        if (!deleteResponse.ok) {
-            throw new Error(`Delete failed: ${deleteResponse.status}`);
-        }
         return {
             success: true,
             message: 'Entry deleted successfully.',
@@ -257,16 +286,18 @@ export async function deleteEntry(entryId, config) {
  */
 export async function validateContentfulCredentials(credentials) {
     try {
-        const response = await fetch(`https://api.contentful.com/spaces/${credentials.spaceId}`, {
-            method: 'GET',
-            headers: {
-                'Authorization': `Bearer ${credentials.accessToken}`,
-                'Content-Type': 'application/vnd.contentful.management.v1+json',
-            },
+        await smartFetch(buildUrl({
+            baseUrl: 'https://api.contentful.com',
+            pathSegments: ['spaces', credentials.spaceId],
+        }), {
+            requestInit: {
+                method: 'GET',
+                headers: {
+                    'Authorization': `Bearer ${credentials.accessToken}`,
+                    'Content-Type': 'application/vnd.contentful.management.v1+json',
+                },
+            }
         });
-        if (!response.ok) {
-            return { valid: false, error: 'Failed to access space' };
-        }
         return { valid: true };
     }
     catch (error) {
@@ -279,42 +310,46 @@ export async function validateContentfulCredentials(credentials) {
 export async function getContentTypes(credentials) {
     const { spaceId, accessToken } = credentials;
     // First get space info to find the default environment
-    const spaceResponse = await fetch(`https://api.contentful.com/spaces/${spaceId}`, {
-        method: 'GET',
-        headers: {
-            'Authorization': `Bearer ${accessToken}`,
-            'Content-Type': 'application/vnd.contentful.management.v1+json',
-        },
+    await smartFetch(buildUrl({
+        baseUrl: 'https://api.contentful.com',
+        pathSegments: ['spaces', spaceId],
+    }), {
+        requestInit: {
+            method: 'GET',
+            headers: {
+                'Authorization': `Bearer ${accessToken}`,
+                'Content-Type': 'application/vnd.contentful.management.v1+json',
+            },
+        }
     });
-    if (!spaceResponse.ok) {
-        throw new Error('Failed to access space');
-    }
     // Try different environment names - Contentful uses 'master' for older spaces, 'main' for newer ones
     const environmentsToTry = ['master', 'main'];
-    let contentTypesResponse = null;
+    let contentTypesData = null;
     let lastError = null;
     for (const env of environmentsToTry) {
         try {
-            const response = await fetch(`https://api.contentful.com/spaces/${spaceId}/environments/${env}/content_types`, {
-                method: 'GET',
-                headers: {
-                    'Authorization': `Bearer ${accessToken}`,
-                    'Content-Type': 'application/vnd.contentful.management.v1+json',
-                },
+            const data = await smartFetch(buildUrl({
+                baseUrl: 'https://api.contentful.com',
+                pathSegments: ['spaces', spaceId, 'environments', env, 'content_types'],
+            }), {
+                requestInit: {
+                    method: 'GET',
+                    headers: {
+                        'Authorization': `Bearer ${accessToken}`,
+                        'Content-Type': 'application/vnd.contentful.management.v1+json',
+                    },
+                }
             });
-            if (response.ok) {
-                contentTypesResponse = response;
-                break;
-            }
+            contentTypesData = data;
+            break;
         }
         catch (error) {
             lastError = error;
         }
     }
-    if (!contentTypesResponse) {
+    if (!contentTypesData) {
         throw new Error(`Failed to fetch content types: ${lastError}`);
     }
-    const contentTypesData = await contentTypesResponse.json();
     return contentTypesData.items || [];
 }
 /**
@@ -324,32 +359,34 @@ export async function migrateContentType(sourceCredentials, destCredentials, con
     try {
         // Get content type from source
         const sourceEnv = sourceCredentials.environment || 'master';
-        const sourceResponse = await fetch(`https://api.contentful.com/spaces/${sourceCredentials.spaceId}/environments/${sourceEnv}/content_types/${contentTypeId}`, {
-            method: 'GET',
-            headers: {
-                'Authorization': `Bearer ${sourceCredentials.accessToken}`,
-                'Content-Type': 'application/vnd.contentful.management.v1+json',
-            },
+        const contentType = await smartFetch(buildUrl({
+            baseUrl: 'https://api.contentful.com',
+            pathSegments: ['spaces', sourceCredentials.spaceId, 'environments', sourceEnv, 'content_types', contentTypeId],
+        }), {
+            requestInit: {
+                method: 'GET',
+                headers: {
+                    'Authorization': `Bearer ${sourceCredentials.accessToken}`,
+                    'Content-Type': 'application/vnd.contentful.management.v1+json',
+                },
+            }
         });
-        if (!sourceResponse.ok) {
-            throw new Error('Failed to fetch content type from source');
-        }
-        const contentType = await sourceResponse.json();
         // Create content type in destination
         const destEnv = destCredentials.environment || 'master';
-        const createResponse = await fetch(`https://api.contentful.com/spaces/${destCredentials.spaceId}/environments/${destEnv}/content_types`, {
-            method: 'POST',
-            headers: {
-                'Authorization': `Bearer ${destCredentials.accessToken}`,
-                'Content-Type': 'application/vnd.contentful.management.v1+json',
-                'X-Contentful-Version': '1',
-            },
-            body: JSON.stringify(contentType),
+        await smartFetch(buildUrl({
+            baseUrl: 'https://api.contentful.com',
+            pathSegments: ['spaces', destCredentials.spaceId, 'environments', destEnv, 'content_types'],
+        }), {
+            requestInit: {
+                method: 'POST',
+                headers: {
+                    'Authorization': `Bearer ${destCredentials.accessToken}`,
+                    'Content-Type': 'application/vnd.contentful.management.v1+json',
+                    'X-Contentful-Version': '1',
+                },
+                body: JSON.stringify(contentType),
+            }
         });
-        if (!createResponse.ok) {
-            const errorData = await createResponse.json();
-            throw new Error(`Failed to create content type: ${errorData.message}`);
-        }
         return { success: true };
     }
     catch (error) {

package/dist/components/integrations/flickr.js

@@ -3,6 +3,8 @@ import { mergeDeep } from '../general/utilities';
 import { hashCode } from '../general/utilities';
 import { CacheManager } from '../general/cache-manager';
 import { getDomain } from '../general/utilities';
+import { smartFetch } from '../general/smartfetch';
+import { buildUrl } from '../general/urlbuilder';
 // Flickr API base URL - non-secret configuration
 const FLICKR_API_BASE_URL = 'https://api.flickr.com/services/rest/?';
 const defaultFlickr = {
@@ -25,13 +27,11 @@ const defaultFlickr = {
 };
 // Utility to build the final Flickr API URL, using proxy if available
 function buildFlickrApiUrl(flickr) {
-    let baseUrl = flickr.baseURL;
-    let queryParams = '';
-    Object.keys(flickr.urlProps).forEach((prop) => {
-        const value = flickr.urlProps[prop];
-        queryParams += (queryParams.length === 0) ? prop + '=' + value : '&' + prop + '=' + value;
+    // Use buildUrl to construct the Flickr REST API URL from parameters
+    const apiUrl = buildUrl({
+        baseUrl: flickr.baseURL,
+        params: flickr.urlProps,
     });
-    const apiUrl = baseUrl + queryParams;
     // Prefer flickr.proxyURL, then globalConfig.proxyUrl, else direct
     if (flickr.proxyURL) {
         return flickr.proxyURL + encodeURIComponent(apiUrl);
@@ -99,18 +99,16 @@ export function GetFlickrData(props) {
     });
     const fetchFlickrData = async () => {
         const cacheKey = hashCode(myURL);
-        let cached = flickrCache.get(cacheKey);
-        if (cached) {
-            if (debug)
-                console.log('Flickr cache hit:', cacheKey);
-            return cached;
-        }
         try {
-            const response = await fetch(myURL);
-            if (!response.ok) {
-                throw new Error(`HTTP error! Status: ${response.status}`);
+            const jsonData = await smartFetch(myURL, {
+                cache: flickrCache,
+                cacheKey,
+                debug,
+            });
+            // Check if Flickr API returned an error response
+            if (jsonData.stat === 'fail') {
+                throw new Error(`Flickr API error: ${jsonData.message || 'Unknown error'}`);
             }
-            const jsonData = await response.json();
             let myFlickrImages = [];
             if (jsonData.photos) {
                 // photos for tags - flickr.photos.search
@@ -121,12 +119,11 @@ export function GetFlickrData(props) {
                 myFlickrImages = jsonData.photoset.photo;
             }
             else {
-                console.log('Error fetching Flickr images');
+                throw new Error('No photos or photoset found in Flickr API response');
             }
             myFlickrImages.sort((a, b) => {
                 return new Date(b.datetaken).getTime() - new Date(a.datetaken).getTime();
             }); // b - a for reverse sort
-            flickrCache.set(cacheKey, myFlickrImages);
             if (debug)
                 console.log('Flickr Cards:', myFlickrImages);
             return myFlickrImages;
@@ -134,10 +131,6 @@ export function GetFlickrData(props) {
         catch (err) {
             console.log('Error fetching Flickr data:', err);
         }
-        finally {
-            if (debug)
-                console.log('Flickr data fetch completed');
-        }
     };
     return fetchFlickrData();
 }