@bigbinary/neeto-webhooks-frontend 3.0.8 → 3.0.10

package/dist/cjs/NeetoWebhooks.js

@@ -655,13 +655,15 @@ var WEBHOOK_INITIAL_VALUES = {
 var EventCheckbox = function EventCheckbox(_ref) {
   var events = _ref.events,
     values = _ref.values,
-    arrayHelpers = _ref.arrayHelpers;
+    arrayHelpers = _ref.arrayHelpers,
+    onEventsChange = _ref.onEventsChange;
   var handleToggle = function handleToggle(isSelected, index, event) {
     if (isSelected) {
       arrayHelpers.remove(index);
     } else {
       arrayHelpers.push(event);
     }
+    onEventsChange === null || onEventsChange === void 0 || onEventsChange();
   };
   return /*#__PURE__*/jsxRuntime.jsx("div", {
     children: events.map(function (event) {
@@ -802,7 +804,7 @@ var getValidationSchema = function getValidationSchema(webhooks) {
     endpoint: yup__namespace.string().trim().matches(/^(https?):\/\//i, i18next.t("neetoWebhooks.errors.webhook.invalidUrlProtocol")).url(i18next.t("neetoWebhooks.errors.webhook.invalidUrl")).required(i18next.t("neetoWebhooks.errors.webhook.required")).test("Is endpoint unique", i18next.t("neetoWebhooks.errors.webhook.urlNotUnique"), function (endpoint, ctx) {
       return !ramda.pluck("endpoint", neetoCist.removeById(ctx.parent.id, webhooks)).includes(endpoint === null || endpoint === void 0 ? void 0 : endpoint.trim());
     }),
-    events: yup__namespace.array().min(1, i18next.t("neetoWebhooks.errors.webhook.events.required")),
+    events: yup__namespace.array()["default"]([]).min(1, i18next.t("neetoWebhooks.errors.webhook.events.required")),
     secret: yup__namespace.string().trim().nullable()
   });
 };
@@ -1003,9 +1005,13 @@ var AddWebhookPane = function AddWebhookPane(_ref) {
     _useFetchEvents$data = _useFetchEvents.data,
     events = _useFetchEvents$data === void 0 ? [] : _useFetchEvents$data,
     isLoading = _useFetchEvents.isLoading;
-  var initialValues = editingWebhookId ? _objectSpread$1(_objectSpread$1({}, WEBHOOK_INITIAL_VALUES), webhook) : _objectSpread$1(_objectSpread$1({}, WEBHOOK_INITIAL_VALUES), {}, {
-    events: events
-  });
+  var initialValues = react.useMemo(function () {
+    return editingWebhookId ? _objectSpread$1(_objectSpread$1(_objectSpread$1({}, WEBHOOK_INITIAL_VALUES), webhook), {}, {
+      events: Array.isArray(webhook === null || webhook === void 0 ? void 0 : webhook.events) ? webhook === null || webhook === void 0 ? void 0 : webhook.events : []
+    }) : _objectSpread$1(_objectSpread$1({}, WEBHOOK_INITIAL_VALUES), {}, {
+      events: events
+    });
+  }, [editingWebhookId, webhook, events]);
   var isWebhookExpiredOrDeprecated = editingWebhookId && (webhook.versionExpired || webhook.versionDeprecated);
   var handleSubmit = function handleSubmit(values) {
     // Check if webhook is expired or deprecated before allowing edit
@@ -1073,10 +1079,10 @@ var AddWebhookPane = function AddWebhookPane(_ref) {
       },
       children: function children(_ref2) {
         var setFieldValue = _ref2.setFieldValue,
+          setFieldTouched = _ref2.setFieldTouched,
           values = _ref2.values,
-          touched = _ref2.touched,
-          errors = _ref2.errors,
-          isValid = _ref2.isValid;
+          isValid = _ref2.isValid,
+          dirty = _ref2.dirty;
         return isLoading ? /*#__PURE__*/jsxRuntime.jsx("div", {
           className: "flex items-center justify-center",
           children: /*#__PURE__*/jsxRuntime.jsx(Spinner, {})
@@ -1149,19 +1155,25 @@ var AddWebhookPane = function AddWebhookPane(_ref) {
                 children: [/*#__PURE__*/jsxRuntime.jsx(Label, {
                   required: true,
                   children: t("neetoWebhooks.common.event", constants.PLURAL)
-                }), !isLoading && /*#__PURE__*/jsxRuntime.jsx(formik.FieldArray, {
+                }), /*#__PURE__*/jsxRuntime.jsx(formik.FieldArray, {
                   name: "events",
                   render: function render(arrayHelpers) {
-                    return /*#__PURE__*/jsxRuntime.jsxs("div", {
-                      children: [/*#__PURE__*/jsxRuntime.jsx(EventCheckbox, {
-                        arrayHelpers: arrayHelpers,
-                        events: events,
-                        values: values
-                      }), touched.events && errors.events && /*#__PURE__*/jsxRuntime.jsx("div", {
-                        className: "neeto-ui-text-error-800 text-xs mt-1",
-                        "data-testid": "event-error-text",
-                        children: errors.events
-                      })]
+                    return /*#__PURE__*/jsxRuntime.jsx(EventCheckbox, {
+                      arrayHelpers: arrayHelpers,
+                      events: events,
+                      values: values,
+                      onEventsChange: function onEventsChange() {
+                        return setFieldTouched("events", true);
+                      }
+                    });
+                  }
+                }), /*#__PURE__*/jsxRuntime.jsx(formik.ErrorMessage, {
+                  name: "events",
+                  render: function render(msg) {
+                    return /*#__PURE__*/jsxRuntime.jsx("div", {
+                      className: "neeto-ui-text-error-800 text-xs mt-1",
+                      "data-testid": "event-error-text",
+                      children: msg
                     });
                   }
                 })]
@@ -1173,7 +1185,7 @@ var AddWebhookPane = function AddWebhookPane(_ref) {
                 onClick: onClose
               },
               submitButtonProps: {
-                disabled: isWebhookExpiredOrDeprecated || !isValid
+                disabled: isWebhookExpiredOrDeprecated || !isValid || editingWebhookId && !dirty
               }
             })
           })]