@comet/brevo-admin 2.0.0-canary-20240612114139 → 2.0.0-canary-20240613061021

package/lib/emailCampaigns/EmailCampaignsGrid.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EmailCampaignsGrid.d.ts","sourceRoot":"","sources":["../../src/emailCampaigns/EmailCampaignsGrid.tsx"],"names":[],"mappings":"AAkBA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAGzD,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAqF/B,wBAAgB,kBAAkB,CAAC,EAC/B,KAAK,EACL,yBAAyB,GAC5B,EAAE;IACC,KAAK,EAAE,qBAAqB,CAAC;IAC7B,yBAAyB,EAAE,cAAc,CAAC;CAC7C,GAAG,KAAK,CAAC,YAAY,CA0IrB"}
+{"version":3,"file":"EmailCampaignsGrid.d.ts","sourceRoot":"","sources":["../../src/emailCampaigns/EmailCampaignsGrid.tsx"],"names":[],"mappings":"AAkBA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAIzD,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAqF/B,wBAAgB,kBAAkB,CAAC,EAC/B,KAAK,EACL,yBAAyB,GAC5B,EAAE;IACC,KAAK,EAAE,qBAAqB,CAAC;IAC7B,yBAAyB,EAAE,cAAc,CAAC;CAC7C,GAAG,KAAK,CAAC,YAAY,CA4IrB"}

package/lib/emailCampaigns/EmailCampaignsGrid.js

@@ -10,6 +10,7 @@ var _admin = require("@comet/admin");
 var _adminIcons = require("@comet/admin-icons");
 var _material = require("@mui/material");
 var _xDataGrid = require("@mui/x-data-grid");
+var _dateFns = require("date-fns");
 var React = _interopRequireWildcard(require("react"));
 var _reactIntl = require("react-intl");
 var _SendingStateColumn = require("./SendingStateColumn");
@@ -144,25 +145,26 @@ function EmailCampaignsGrid(_ref) {
     type: "actions",
     renderCell: function renderCell(_ref7) {
       var row = _ref7.row;
-      return /*#__PURE__*/React.createElement(React.Fragment, null, !(row.sendingState === "SENT" || row.scheduledAt && row.scheduledAt < new Date()) && /*#__PURE__*/React.createElement(_material.IconButton, {
+      var isScheduledDateInPast = row.scheduledAt != undefined && (0, _dateFns.isBefore)(new Date(row.scheduledAt), new Date());
+      return /*#__PURE__*/React.createElement(React.Fragment, null, row.sendingState !== "SENT" && !isScheduledDateInPast && /*#__PURE__*/React.createElement(_material.IconButton, {
         component: _admin.StackLink,
         pageName: "edit",
         payload: row.id
       }, /*#__PURE__*/React.createElement(_adminIcons.Edit, {
         color: "primary"
-      })), row.sendingState === "SENT" && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_material.IconButton, {
+      })), row.sendingState === "SENT" && /*#__PURE__*/React.createElement(_material.IconButton, {
         component: _admin.StackLink,
         pageName: "statistics",
         payload: row.id
       }, /*#__PURE__*/React.createElement(_adminIcons.Statistics, {
         color: "primary"
-      })), /*#__PURE__*/React.createElement(_material.IconButton, {
+      })), (row.sendingState === "SENT" || row.sendingState == "SCHEDULED" && isScheduledDateInPast) && /*#__PURE__*/React.createElement(_material.IconButton, {
         component: _admin.StackLink,
         pageName: "view",
         payload: row.id
       }, /*#__PURE__*/React.createElement(_adminIcons.Visible, {
         color: "primary"
-      }))), /*#__PURE__*/React.createElement(_admin.CrudContextMenu, {
+      })), /*#__PURE__*/React.createElement(_admin.CrudContextMenu, {
         copyData: function copyData() {
           return {
             title: row.title,

package/lib/emailCampaigns/form/EmailCampaignForm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EmailCampaignForm.d.ts","sourceRoot":"","sources":["../../../src/emailCampaigns/form/EmailCampaignForm.tsx"],"names":[],"mappings":"AAeA,OAAO,EAGH,cAAc,EAKjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAEH,qBAAqB,EASxB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,KAAkB,MAAM,OAAO,CAAC;AAoBvC,UAAU,SAAS;IACf,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,yBAAyB,EAAE,cAAc,CAAC;IAC1C,KAAK,EAAE,qBAAqB,CAAC;IAC7B,UAAU,EAAE,MAAM,CAAC;CACtB;AAED,wBAAgB,iBAAiB,CAAC,EAAE,EAAE,EAAE,yBAAyB,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE,SAAS,GAAG,KAAK,CAAC,YAAY,CAkPrH"}
+{"version":3,"file":"EmailCampaignForm.d.ts","sourceRoot":"","sources":["../../../src/emailCampaigns/form/EmailCampaignForm.tsx"],"names":[],"mappings":"AAeA,OAAO,EAGH,cAAc,EAKjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAEH,qBAAqB,EASxB,MAAM,kBAAkB,CAAC;AAG1B,OAAO,KAAkB,MAAM,OAAO,CAAC;AAoBvC,UAAU,SAAS;IACf,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,yBAAyB,EAAE,cAAc,CAAC;IAC1C,KAAK,EAAE,qBAAqB,CAAC;IAC7B,UAAU,EAAE,MAAM,CAAC;CACtB;AAED,wBAAgB,iBAAiB,CAAC,EAAE,EAAE,EAAE,yBAAyB,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE,SAAS,GAAG,KAAK,CAAC,YAAY,CAmPrH"}

package/lib/emailCampaigns/form/EmailCampaignForm.js

@@ -10,6 +10,7 @@ var _adminIcons = require("@comet/admin-icons");
 var _blocksAdmin = require("@comet/blocks-admin");
 var _cmsAdmin = require("@comet/cms-admin");
 var _material = require("@mui/material");
+var _dateFns = require("date-fns");
 var _react = _interopRequireWildcard(require("react"));
 var _reactIntl = require("react-intl");
 var _reactRouter = require("react-router");
@@ -319,7 +320,8 @@ function EmailCampaignForm(_ref) {
     emailCampaignId: id,
     content: EmailCampaignContentBlock.createPreviewState(state.content, previewContext)
   };
-  var isScheduleDateDisabled = state.sendingState === "SENT" || mode === "add" || !state.targetGroup;
+  var isScheduledDateInPast = state.scheduledAt != undefined && (0, _dateFns.isBefore)(new Date(state.scheduledAt), new Date());
+  var isSchedulingDisabled = state.sendingState === "SENT" || mode === "add" || !state.targetGroup || isScheduledDateInPast;
   return /*#__PURE__*/_react["default"].createElement(_cmsAdmin.EditPageLayout, null, saveConflict.dialogs, /*#__PURE__*/_react["default"].createElement(_admin.Toolbar, null, /*#__PURE__*/_react["default"].createElement(_admin.ToolbarItem, null, /*#__PURE__*/_react["default"].createElement(_material.IconButton, {
     onClick: stackApi === null || stackApi === void 0 ? void 0 : stackApi.goBack
   }, /*#__PURE__*/_react["default"].createElement(_adminIcons.ArrowLeft, null))), /*#__PURE__*/_react["default"].createElement(_admin.ToolbarTitleItem, null, /*#__PURE__*/_react["default"].createElement(_reactIntl.FormattedMessage, {
@@ -386,7 +388,7 @@ function EmailCampaignForm(_ref) {
       scope: scope
     }, /*#__PURE__*/_react["default"].createElement(_SendManagerFields.SendManagerFields, {
       scope: scope,
-      disableScheduling: isScheduleDateDisabled,
+      isSchedulingDisabled: isSchedulingDisabled,
       isSendable: !hasChanges && state.targetGroup != undefined,
       id: id
     }), /*#__PURE__*/_react["default"].createElement(_TestEmailCampaignForm.TestEmailCampaignForm, {

package/lib/emailCampaigns/form/SendManagerFields.d.ts

@@ -1,11 +1,11 @@
 import { ContentScopeInterface } from "@comet/cms-admin";
 import * as React from "react";
 interface SendManagerFieldsProps {
-    disableScheduling?: boolean;
     scope: ContentScopeInterface;
     id?: string;
     isSendable: boolean;
+    isSchedulingDisabled?: boolean;
 }
-export declare const SendManagerFields: ({ disableScheduling, scope, id, isSendable }: SendManagerFieldsProps) => React.JSX.Element;
+export declare const SendManagerFields: ({ isSchedulingDisabled, scope, id, isSendable }: SendManagerFieldsProps) => React.JSX.Element;
 export {};
 //# sourceMappingURL=SendManagerFields.d.ts.map

package/lib/emailCampaigns/form/SendManagerFields.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SendManagerFields.d.ts","sourceRoot":"","sources":["../../../src/emailCampaigns/form/SendManagerFields.tsx"],"names":[],"mappings":"AAKA,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAEzD,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAY/B,UAAU,sBAAsB;IAC5B,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,KAAK,EAAE,qBAAqB,CAAC;IAC7B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,OAAO,CAAC;CACvB;AAeD,eAAO,MAAM,iBAAiB,iDAAkD,sBAAsB,sBAiFrG,CAAC"}
+{"version":3,"file":"SendManagerFields.d.ts","sourceRoot":"","sources":["../../../src/emailCampaigns/form/SendManagerFields.tsx"],"names":[],"mappings":"AAKA,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAEzD,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAY/B,UAAU,sBAAsB;IAC5B,KAAK,EAAE,qBAAqB,CAAC;IAC7B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,OAAO,CAAC;IACpB,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAClC;AAeD,eAAO,MAAM,iBAAiB,oDAAqD,sBAAsB,sBAoFxG,CAAC"}

package/lib/emailCampaigns/form/SendManagerFields.js

@@ -37,10 +37,11 @@ var validateScheduledAt = function validateScheduledAt(value, now) {
   }
 };
 var SendManagerFields = exports.SendManagerFields = function SendManagerFields(_ref) {
-  var disableScheduling = _ref.disableScheduling,
+  var isSchedulingDisabled = _ref.isSchedulingDisabled,
     scope = _ref.scope,
     id = _ref.id,
     isSendable = _ref.isSendable;
+  var stackSwitchApi = (0, _admin.useStackSwitchApi)();
   var _React$useState = React.useState(false),
     _React$useState2 = _slicedToArray(_React$useState, 2),
     isSendEmailCampaignNowDialogOpen = _React$useState2[0],
@@ -66,7 +67,7 @@ var SendManagerFields = exports.SendManagerFields = function SendManagerFields(_
     })
   }, /*#__PURE__*/React.createElement(_admin.Field, {
     name: "scheduledAt",
-    disabled: disableScheduling,
+    disabled: isSchedulingDisabled,
     fullWidth: true,
     clearable: true,
     label: /*#__PURE__*/React.createElement(_reactIntl.FormattedMessage, {
@@ -75,7 +76,7 @@ var SendManagerFields = exports.SendManagerFields = function SendManagerFields(_
     }),
     component: _adminDateTime.FinalFormDateTimePicker,
     validate: function validate(value) {
-      return validateScheduledAt(value, now);
+      return isSchedulingDisabled ? undefined : validateScheduledAt(value, now);
     },
     componentsProps: {
       datePicker: {
@@ -105,7 +106,7 @@ var SendManagerFields = exports.SendManagerFields = function SendManagerFields(_
     }));
   }), /*#__PURE__*/React.createElement(_admin.SaveButton, {
     variant: "contained",
-    disabled: !isSendable && id == undefined && disableScheduling,
+    disabled: !isSendable || isSchedulingDisabled,
     saveIcon: /*#__PURE__*/React.createElement(_adminIcons.Newsletter, null),
     saving: sendEmailCampaignNowLoading,
     hasErrors: !!sendEmailCampaignNowError,
@@ -133,7 +134,7 @@ var SendManagerFields = exports.SendManagerFields = function SendManagerFields(_
         while (1) switch (_context.prev = _context.next) {
           case 0:
             if (!id) {
-              _context.next = 4;
+              _context.next = 5;
               break;
             }
             _context.next = 3;
@@ -144,7 +145,8 @@ var SendManagerFields = exports.SendManagerFields = function SendManagerFields(_
             });
           case 3:
             setIsSendEmailCampaignNowDialogOpen(false);
-          case 4:
+            stackSwitchApi.activatePage("grid", "");
+          case 5:
           case "end":
             return _context.stop();
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@comet/brevo-admin",
-  "version": "2.0.0-canary-20240612114139",
+  "version": "2.0.0-canary-20240613061021",
   "repository": {
     "type": "git",
     "url": "https://github.com/vivid-planet/comet-brevo-module/",
@@ -13,6 +13,7 @@
     "lib"
   ],
   "dependencies": {
+    "date-fns": "^2.28.0",
     "file-saver": "^2.0.5",
     "lodash.isequal": "^4.0.0"
   },