@commercetools-frontend-extensions/export-resources-modal 4.6.11 → 4.6.12

package/dist/commercetools-frontend-extensions-export-resources-modal.cjs.dev.js

@@ -43,7 +43,6 @@ var _Array$isArray = require('@babel/runtime-corejs3/core-js-stable/array/is-arr
 var _Set = require('@babel/runtime-corejs3/core-js-stable/set');
 var _sortInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/sort');
 var _indexOfInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/index-of');
-var moment = require('moment');
 var actionsGlobal = require('@commercetools-frontend/actions-global');
 var constants = require('@commercetools-frontend/constants');
 var sdk = require('@commercetools-frontend/sdk');
@@ -87,7 +86,6 @@ var _Array$isArray__default = /*#__PURE__*/_interopDefault(_Array$isArray);
 var _Set__default = /*#__PURE__*/_interopDefault(_Set);
 var _sortInstanceProperty__default = /*#__PURE__*/_interopDefault(_sortInstanceProperty);
 var _indexOfInstanceProperty__default = /*#__PURE__*/_interopDefault(_indexOfInstanceProperty);
-var moment__default = /*#__PURE__*/_interopDefault(moment);
 var sortBy__default = /*#__PURE__*/_interopDefault(sortBy);
 var _styled__default = /*#__PURE__*/_interopDefault(_styled);
 var _includesInstanceProperty__default = /*#__PURE__*/_interopDefault(_includesInstanceProperty);
@@ -670,8 +668,26 @@ function validate(_ref) {
   return omitEmpty__default["default"](errors);
 }
 
-function resourceTypeToFileName(resourceType) {
-  const todayFormatted = moment__default["default"]().format('DD-MM-YY_HH-mm');
+function resourceTypeToFileName(resourceType, locale) {
+  var _context;
+  const date = new Date();
+  const dateFormatter = new Intl.DateTimeFormat(locale, {
+    year: '2-digit',
+    month: '2-digit',
+    day: '2-digit',
+    hour: '2-digit',
+    minute: '2-digit',
+    hour12: false
+  });
+  const parts = dateFormatter.formatToParts(date);
+  const dateParts = _reduceInstanceProperty__default["default"](parts).call(parts, (acc, part) => {
+    if (part.type !== 'literal') {
+      acc[part.type] = part.value;
+    }
+    return acc;
+  }, {});
+  const orderedDateParts = _mapInstanceProperty__default["default"](_context = _filterInstanceProperty__default["default"](parts).call(parts, part => part.type === 'day' || part.type === 'month' || part.type === 'year')).call(_context, part => dateParts[part.type]).join('-');
+  const formattedDate = `${orderedDateParts}_${dateParts.hour}-${dateParts.minute}`;
   const resourceTypeMap = {
     [EXPORTABLE_RESOURCES.CATEGORY]: 'Categories',
     [EXPORTABLE_RESOURCES.PRODUCT]: 'Products',
@@ -685,7 +701,7 @@ function resourceTypeToFileName(resourceType) {
   if (!displayName) {
     throw new UnexpectedResourceTypeError(resourceType);
   }
-  return `${displayName}_Export_${todayFormatted}`;
+  return `${displayName}_Export_${formattedDate}`;
 }
 function mapLocalesToOptions(locales) {
   return _mapInstanceProperty__default["default"](locales).call(locales, locale => ({
@@ -889,9 +905,11 @@ const updateFieldDependenciesStatus = formik => {
 const useInitialValues = props => {
   var _context;
   const _useApplicationContex = applicationShellConnectors.useApplicationContext(applicationContext => ({
-      locale: applicationContext.dataLocale
+      locale: applicationContext.dataLocale,
+      userLocale: applicationContext.user?.locale
     })),
-    locale = _useApplicationContex.locale;
+    locale = _useApplicationContex.locale,
+    userLocale = _useApplicationContex.userLocale;
   const _useApplicationContex2 = applicationShellConnectors.useApplicationContext(context => ({
       projectKey: context.project?.key
     })),
@@ -912,11 +930,11 @@ const useInitialValues = props => {
     groups = updateFieldGroupsWithIsExpandedValue(groups, cachedExpandedGroups[props.resourceType] || {});
     return {
       outputFormat: props.outputFormat,
-      fileName: `${resourceTypeToFileName(props.resourceType)}`,
+      fileName: `${resourceTypeToFileName(props.resourceType, userLocale)}`,
       locales: [locale],
       groups: updateFieldGroupWithAdditionalFieldExtensions(groups)
     };
-  }, [props.fieldGroups, props.resourceType, props.outputFormat, cachedSelectedGroups, cachedExpandedGroups, locale]);
+  }, [props.fieldGroups, props.resourceType, props.outputFormat, cachedSelectedGroups, cachedExpandedGroups, locale, userLocale]);
 };
 
 async function createExportOperation(_ref, asyncDispatchFn) {

package/dist/commercetools-frontend-extensions-export-resources-modal.cjs.prod.js

@@ -43,7 +43,6 @@ var _Array$isArray = require('@babel/runtime-corejs3/core-js-stable/array/is-arr
 var _Set = require('@babel/runtime-corejs3/core-js-stable/set');
 var _sortInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/sort');
 var _indexOfInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/index-of');
-var moment = require('moment');
 var actionsGlobal = require('@commercetools-frontend/actions-global');
 var constants = require('@commercetools-frontend/constants');
 var sdk = require('@commercetools-frontend/sdk');
@@ -87,7 +86,6 @@ var _Array$isArray__default = /*#__PURE__*/_interopDefault(_Array$isArray);
 var _Set__default = /*#__PURE__*/_interopDefault(_Set);
 var _sortInstanceProperty__default = /*#__PURE__*/_interopDefault(_sortInstanceProperty);
 var _indexOfInstanceProperty__default = /*#__PURE__*/_interopDefault(_indexOfInstanceProperty);
-var moment__default = /*#__PURE__*/_interopDefault(moment);
 var sortBy__default = /*#__PURE__*/_interopDefault(sortBy);
 var _styled__default = /*#__PURE__*/_interopDefault(_styled);
 var _includesInstanceProperty__default = /*#__PURE__*/_interopDefault(_includesInstanceProperty);
@@ -670,8 +668,26 @@ function validate(_ref) {
   return omitEmpty__default["default"](errors);
 }
 
-function resourceTypeToFileName(resourceType) {
-  const todayFormatted = moment__default["default"]().format('DD-MM-YY_HH-mm');
+function resourceTypeToFileName(resourceType, locale) {
+  var _context;
+  const date = new Date();
+  const dateFormatter = new Intl.DateTimeFormat(locale, {
+    year: '2-digit',
+    month: '2-digit',
+    day: '2-digit',
+    hour: '2-digit',
+    minute: '2-digit',
+    hour12: false
+  });
+  const parts = dateFormatter.formatToParts(date);
+  const dateParts = _reduceInstanceProperty__default["default"](parts).call(parts, (acc, part) => {
+    if (part.type !== 'literal') {
+      acc[part.type] = part.value;
+    }
+    return acc;
+  }, {});
+  const orderedDateParts = _mapInstanceProperty__default["default"](_context = _filterInstanceProperty__default["default"](parts).call(parts, part => part.type === 'day' || part.type === 'month' || part.type === 'year')).call(_context, part => dateParts[part.type]).join('-');
+  const formattedDate = `${orderedDateParts}_${dateParts.hour}-${dateParts.minute}`;
   const resourceTypeMap = {
     [EXPORTABLE_RESOURCES.CATEGORY]: 'Categories',
     [EXPORTABLE_RESOURCES.PRODUCT]: 'Products',
@@ -685,7 +701,7 @@ function resourceTypeToFileName(resourceType) {
   if (!displayName) {
     throw new UnexpectedResourceTypeError(resourceType);
   }
-  return `${displayName}_Export_${todayFormatted}`;
+  return `${displayName}_Export_${formattedDate}`;
 }
 function mapLocalesToOptions(locales) {
   return _mapInstanceProperty__default["default"](locales).call(locales, locale => ({
@@ -889,9 +905,11 @@ const updateFieldDependenciesStatus = formik => {
 const useInitialValues = props => {
   var _context;
   const _useApplicationContex = applicationShellConnectors.useApplicationContext(applicationContext => ({
-      locale: applicationContext.dataLocale
+      locale: applicationContext.dataLocale,
+      userLocale: applicationContext.user?.locale
     })),
-    locale = _useApplicationContex.locale;
+    locale = _useApplicationContex.locale,
+    userLocale = _useApplicationContex.userLocale;
   const _useApplicationContex2 = applicationShellConnectors.useApplicationContext(context => ({
       projectKey: context.project?.key
     })),
@@ -912,11 +930,11 @@ const useInitialValues = props => {
     groups = updateFieldGroupsWithIsExpandedValue(groups, cachedExpandedGroups[props.resourceType] || {});
     return {
       outputFormat: props.outputFormat,
-      fileName: `${resourceTypeToFileName(props.resourceType)}`,
+      fileName: `${resourceTypeToFileName(props.resourceType, userLocale)}`,
       locales: [locale],
       groups: updateFieldGroupWithAdditionalFieldExtensions(groups)
     };
-  }, [props.fieldGroups, props.resourceType, props.outputFormat, cachedSelectedGroups, cachedExpandedGroups, locale]);
+  }, [props.fieldGroups, props.resourceType, props.outputFormat, cachedSelectedGroups, cachedExpandedGroups, locale, userLocale]);
 };
 
 async function createExportOperation(_ref, asyncDispatchFn) {

package/dist/commercetools-frontend-extensions-export-resources-modal.esm.js

@@ -39,7 +39,6 @@ import _Array$isArray from '@babel/runtime-corejs3/core-js-stable/array/is-array
 import _Set from '@babel/runtime-corejs3/core-js-stable/set';
 import _sortInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/sort';
 import _indexOfInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/index-of';
-import moment from 'moment';
 import { useShowNotification } from '@commercetools-frontend/actions-global';
 import { MC_API_PROXY_TARGETS, DOMAINS } from '@commercetools-frontend/constants';
 import { actions, useAsyncDispatch } from '@commercetools-frontend/sdk';
@@ -631,8 +630,26 @@ function validate(_ref) {
   return omitEmpty(errors);
 }
 
-function resourceTypeToFileName(resourceType) {
-  const todayFormatted = moment().format('DD-MM-YY_HH-mm');
+function resourceTypeToFileName(resourceType, locale) {
+  var _context;
+  const date = new Date();
+  const dateFormatter = new Intl.DateTimeFormat(locale, {
+    year: '2-digit',
+    month: '2-digit',
+    day: '2-digit',
+    hour: '2-digit',
+    minute: '2-digit',
+    hour12: false
+  });
+  const parts = dateFormatter.formatToParts(date);
+  const dateParts = _reduceInstanceProperty(parts).call(parts, (acc, part) => {
+    if (part.type !== 'literal') {
+      acc[part.type] = part.value;
+    }
+    return acc;
+  }, {});
+  const orderedDateParts = _mapInstanceProperty(_context = _filterInstanceProperty(parts).call(parts, part => part.type === 'day' || part.type === 'month' || part.type === 'year')).call(_context, part => dateParts[part.type]).join('-');
+  const formattedDate = `${orderedDateParts}_${dateParts.hour}-${dateParts.minute}`;
   const resourceTypeMap = {
     [EXPORTABLE_RESOURCES.CATEGORY]: 'Categories',
     [EXPORTABLE_RESOURCES.PRODUCT]: 'Products',
@@ -646,7 +663,7 @@ function resourceTypeToFileName(resourceType) {
   if (!displayName) {
     throw new UnexpectedResourceTypeError(resourceType);
   }
-  return `${displayName}_Export_${todayFormatted}`;
+  return `${displayName}_Export_${formattedDate}`;
 }
 function mapLocalesToOptions(locales) {
   return _mapInstanceProperty(locales).call(locales, locale => ({
@@ -850,9 +867,11 @@ const updateFieldDependenciesStatus = formik => {
 const useInitialValues = props => {
   var _context;
   const _useApplicationContex = useApplicationContext(applicationContext => ({
-      locale: applicationContext.dataLocale
+      locale: applicationContext.dataLocale,
+      userLocale: applicationContext.user?.locale
     })),
-    locale = _useApplicationContex.locale;
+    locale = _useApplicationContex.locale,
+    userLocale = _useApplicationContex.userLocale;
   const _useApplicationContex2 = useApplicationContext(context => ({
       projectKey: context.project?.key
     })),
@@ -873,11 +892,11 @@ const useInitialValues = props => {
     groups = updateFieldGroupsWithIsExpandedValue(groups, cachedExpandedGroups[props.resourceType] || {});
     return {
       outputFormat: props.outputFormat,
-      fileName: `${resourceTypeToFileName(props.resourceType)}`,
+      fileName: `${resourceTypeToFileName(props.resourceType, userLocale)}`,
       locales: [locale],
       groups: updateFieldGroupWithAdditionalFieldExtensions(groups)
     };
-  }, [props.fieldGroups, props.resourceType, props.outputFormat, cachedSelectedGroups, cachedExpandedGroups, locale]);
+  }, [props.fieldGroups, props.resourceType, props.outputFormat, cachedSelectedGroups, cachedExpandedGroups, locale, userLocale]);
 };
 
 async function createExportOperation(_ref, asyncDispatchFn) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@commercetools-frontend-extensions/export-resources-modal",
   "description": "Shared export modal for exporting resources",
-  "version": "4.6.11",
+  "version": "4.6.12",
   "license": "BSD-3-Clause",
   "publishConfig": {
     "access": "public"