Dev

packages/azure_file_storage/api/fileBrowser/azureFileBrowser.js

@@ -42,25 +42,24 @@ module.exports = async (request, response, delegate, next) => {
       for await (const blob of blobs) {
         const blobName = blob.name;
         const blobUrl = `${containerClient.url}/${blobName}`;
-
-        // Get the subfolder or file name within the directory
         const relativePath = blobName.substring(path.length);
-
-        // Check if it's a subfolder or file
         const slashIndex = relativePath.indexOf('/');
         if (slashIndex === -1) {
           // It's a file
-          files.push({
-            name: relativePath,
-            url: blobUrl
-          });
+          if (blob.properties.contentLength) {
+            files.push({
+              name: relativePath,
+              url: blobUrl
+            });
+          }
         } else {
           // It's a subfolder
           const subfolder = relativePath.substring(0, slashIndex);
-          subfolders.add(subfolder);
+          if (subfolder !== '') {
+            subfolders.add(subfolder);
+          }
         }
       }
-      // Send the response with the uploaded image details
       response.status(OK).json({
         data: {
           folders: Array.from(subfolders),
@@ -69,7 +68,6 @@ module.exports = async (request, response, delegate, next) => {
       });
     } catch (error) {
       debug('critical', error);
-      // Return an error response if there was an error uploading the images
       response.status(INTERNAL_SERVER_ERROR);
       response.json({
         error: {

packages/azure_file_storage/api/imageUpload/[multerFile]azureBlob.js

@@ -9,7 +9,7 @@ const {
 
 let blobServiceClient;
 let containerName;
-if (getConfig('file_storage') === 'azure') {
+if (getConfig('system.file_storage') === 'azure') {
   blobServiceClient = BlobServiceClient.fromConnectionString(
     getEnv('AZURE_STORAGE_CONNECTION_STRING')
   );
@@ -18,7 +18,7 @@ if (getConfig('file_storage') === 'azure') {
 
 module.exports = async (request, response, delegate, next) => {
   // If the file storage is not Azure, call the next middleware function
-  if (getConfig('file_storage') !== 'azure') {
+  if (getConfig('system.file_storage') !== 'azure') {
     next();
   } else {
     try {

packages/azure_file_storage/subscribers/product_image_added/azureGenerateProductImageVariant.js

@@ -45,7 +45,7 @@ async function resizeAndUploadImage(
 }
 
 module.exports = async function azureGenerateProductImageVariant(data) {
-  if (getConfig('file_storage') === 'azure') {
+  if (getConfig('system.file_storage') === 'azure') {
     try {
       const containerName = getEnv('AZURE_STORAGE_CONTAINER_NAME', 'images');
       const originalBlobUrl = data.origin_image;

packages/s3_file_storage/api/fileBrowser/awsFileBrowser.js

@@ -12,7 +12,7 @@ const bucketName = getEnv('AWS_BUCKET_NAME');
 
 module.exports = async (request, response, delegate, next) => {
   // If the file storage is not S3, skip this middleware
-  if (getConfig('file_storage') !== 's3') {
+  if (getConfig('system.file_storage') !== 's3') {
     next();
   } else {
     try {

packages/s3_file_storage/api/fileDelete/awsFileDelete.js

@@ -15,7 +15,7 @@ const s3Client = new S3Client({ region: getEnv('AWS_REGION') });
 const bucketName = getEnv('AWS_BUCKET_NAME');
 
 module.exports = async (request, response, delegate, next) => {
-  if (getConfig('file_storage') !== 's3') {
+  if (getConfig('system.file_storage') !== 's3') {
     next();
   } else {
     try {

packages/s3_file_storage/api/imageUpload/[multerFile]awsUpload.js

@@ -13,7 +13,7 @@ const bucketName = getEnv('AWS_BUCKET_NAME');
 
 module.exports = async (request, response, delegate, next) => {
   // If the file storage is not S3, call the next middleware function
-  if (getConfig('file_storage') !== 's3') {
+  if (getConfig('system.file_storage') !== 's3') {
     next();
   } else {
     const imageFiles = request.files;

packages/s3_file_storage/subscribers/product_image_added/awsGenerateProductImageVariant.js

@@ -59,7 +59,7 @@ async function resizeAndUploadImage(
 }
 
 module.exports = async function awsGenerateProductImageVariant(data) {
-  if (getConfig('file_storage') === 's3') {
+  if (getConfig('system.file_storage') === 's3') {
     try {
       const s3Client = new S3Client({ region: getEnv('AWS_REGION') });
       const originalObjectUrl = data.origin_image;