@bigbinary/neeto-redirect-urls-frontend 2.2.8 → 2.2.10

package/dist/cjs/RedirectUrls.js

@@ -5,6 +5,7 @@ var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
 var react = require('react');
 var neetoCist = require('@bigbinary/neeto-cist');
 var reactUtils = require('@bigbinary/neeto-commons-frontend/react-utils');
+var utils = require('@bigbinary/neeto-commons-frontend/utils');
 var Container = require('@bigbinary/neeto-molecules/Container');
 var Header = require('@bigbinary/neeto-molecules/Header');
 var PageLoader = require('@bigbinary/neeto-molecules/PageLoader');
@@ -19,7 +20,10 @@ var Typography = require('@bigbinary/neetoui/Typography');
 var Input = require('@bigbinary/neetoui/formik/Input');
 var Form = require('@bigbinary/neetoui/formik/Form');
 var ActionBlock = require('@bigbinary/neetoui/formik/ActionBlock');
-var Yup = require('yup');
+var i18next = require('i18next');
+var constants = require('@bigbinary/neeto-commons-frontend/constants');
+var yup = require('yup');
+var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
 var reactQuery = require('@tanstack/react-query');
 var axios = require('axios');
 var Edit = require('@bigbinary/neeto-icons/Edit');
@@ -27,13 +31,9 @@ var CardLayout = require('@bigbinary/neeto-molecules/CardLayout');
 var InlineInput = require('@bigbinary/neeto-molecules/InlineInput');
 var Label = require('@bigbinary/neetoui/Label');
 var Switch = require('@bigbinary/neetoui/formik/Switch');
-var i18next = require('i18next');
-var constants = require('@bigbinary/neeto-commons-frontend/constants');
 var MoreDropdown = require('@bigbinary/neeto-molecules/MoreDropdown');
 var TableWrapper = require('@bigbinary/neeto-molecules/TableWrapper');
 var Table = require('@bigbinary/neetoui/Table');
-var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
-var utils = require('@bigbinary/neeto-commons-frontend/utils');
 
 function _interopNamespaceDefault(e) {
   var n = Object.create(null);
@@ -52,7 +52,7 @@ function _interopNamespaceDefault(e) {
   return Object.freeze(n);
 }
 
-var Yup__namespace = /*#__PURE__*/_interopNamespaceDefault(Yup);
+var yup__namespace = /*#__PURE__*/_interopNamespaceDefault(yup);
 
 var DeleteRedirectUrlModal = function DeleteRedirectUrlModal(_ref) {
   var handleClose = _ref.handleClose,
@@ -84,9 +84,21 @@ var DeleteRedirectUrlModal = function DeleteRedirectUrlModal(_ref) {
   });
 };
 
-var URL_WITH_PROTOCOL_REGEX = /^(http(s)?):\/\/[(www.)?a-zA-Z0-9@:%._+~#=-]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_+.~#?&//=]*)$/g;
 var URL_PATHNAME_REGEX = /^\/[-a-zA-Z0-9@:%_+.~#?&//=]*$/g;
 
+var REDIRECT_URL_VALIDATION_SCHEMA = yup__namespace.object().shape({
+  fromPath: yup__namespace.string().required(i18next.t("neetoRedirectUrls.redirect.validations.required", {
+    entity: "Source"
+  })).matches(URL_PATHNAME_REGEX, i18next.t("neetoRedirectUrls.redirect.validations.source")),
+  toPath: yup__namespace.string().required(i18next.t("neetoRedirectUrls.redirect.validations.required", {
+    entity: "Destination"
+  })).matches(new RegExp("".concat(constants.VALID_URL_REGEX.source, "|").concat(URL_PATHNAME_REGEX.source)), i18next.t("neetoRedirectUrls.redirect.validations.destination")).test("paths-not-same", i18next.t("neetoRedirectUrls.redirect.validations.samePaths"), function (value, context) {
+    var fromPath = context.parent.fromPath;
+    if (!value || !fromPath) return true;
+    return value !== fromPath;
+  })
+});
+
 function ownKeys$2(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$2(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$2(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$2(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var RedirectUrlPane = function RedirectUrlPane(_ref) {
@@ -111,16 +123,9 @@ var RedirectUrlPane = function RedirectUrlPane(_ref) {
           fromPath: "",
           toPath: ""
         },
-        validationSchema: Yup__namespace.object().shape({
-          fromPath: Yup__namespace.string().required(t("neetoRedirectUrls.redirect.validations.required", {
-            entity: "Source"
-          })).matches(URL_PATHNAME_REGEX, t("neetoRedirectUrls.redirect.validations.source")),
-          toPath: Yup__namespace.string().required(t("neetoRedirectUrls.redirect.validations.required", {
-            entity: "Destination"
-          })).matches(new RegExp("".concat(URL_WITH_PROTOCOL_REGEX.source, "|").concat(URL_PATHNAME_REGEX.source)), t("neetoRedirectUrls.redirect.validations.destination"))
-        }),
-        onSubmit: function onSubmit(values) {
-          handleSubmit(_objectSpread$2({}, values));
+        validationSchema: REDIRECT_URL_VALIDATION_SCHEMA,
+        onSubmit: function onSubmit(values, formikBag) {
+          handleSubmit(_objectSpread$2({}, values), formikBag);
         }
       },
       children: /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
@@ -128,12 +133,14 @@ var RedirectUrlPane = function RedirectUrlPane(_ref) {
           children: /*#__PURE__*/jsxRuntime.jsxs("div", {
             className: "w-full space-y-4",
             children: [/*#__PURE__*/jsxRuntime.jsx(Input, {
+              required: true,
               id: "fromPath",
               label: t("neetoRedirectUrls.redirect.source"),
               name: "fromPath",
               ref: setInitialFocusField,
               placeholder: t("neetoRedirectUrls.common.placeholder.relativeUrl")
             }), /*#__PURE__*/jsxRuntime.jsx(Input, {
+              required: true,
               id: "toPath",
               label: t("neetoRedirectUrls.redirect.destination"),
               name: "toPath",
@@ -152,6 +159,89 @@ var RedirectUrlPane = function RedirectUrlPane(_ref) {
   });
 };
 
+var SETTINGS_CATEGORIES = {
+  GENERAL: "GENERAL"
+};
+var SETTINGS_CATEGORIES_LABELS = _defineProperty({}, SETTINGS_CATEGORIES.GENERAL, i18next.t("neetoRedirectUrls.settings.general.title"));
+var SHOW_TOASTR_CONFIG = {
+  showToastr: false
+};
+
+var routes = {
+  admin: {
+    index: "/admin",
+    courses: {
+      chapters: {
+        show: "/admin/courses/:courseId/chapters/:chapterId",
+        chapterVersions: {
+          show: "/admin/courses/:courseId/chapters/:chapterId/chapter-versions/:chapterVersionId"
+        },
+        pages: {
+          show: "/admin/courses/:courseId/chapters/:chapterId/pages/:pageId",
+          pageVersions: {
+            show: "/admin/courses/:courseId/chapters/:chapterId/pages/:pageId/page-versions/:pageVersionId"
+          }
+        }
+      },
+      index: "/admin/courses",
+      show: "/admin/courses/:courseId",
+      deployments: {
+        index: "/admin/courses/:courseId/deployments",
+        show: "/admin/courses/:courseId/deployments/:deploymentId"
+      },
+      configure: {
+        index: "/admin/courses/:courseId/configure",
+        security: "/admin/courses/:courseId/configure/security",
+        certificateConfiguration: "/admin/courses/:courseId/configure/certificate_configuration"
+      }
+    },
+    pullRequestApps: {
+      index: "/admin/pull_request_apps",
+      show: "/admin/pull_request_apps/:pullRequestAppId",
+      courseDeployments: {
+        show: "/admin/pull_request_apps/:pullRequestAppId/course-deployments/:courseDeploymentId"
+      }
+    },
+    members: "/admin/members",
+    adminPanel: "/admin/admin-panel",
+    reports: {
+      index: "/admin/reports",
+      invalidUrls: "/admin/reports/invalid-urls"
+    },
+    assets: {
+      index: "/admin/assets",
+      databases: "/admin/assets/databases",
+      videos: "/admin/assets/videos",
+      audios: "/admin/assets/audios",
+      resources: "/admin/assets/resources"
+    }
+  },
+  home: "/"
+};
+
+var buildSettingsBreadcrumbs = function buildSettingsBreadcrumbs(category, pageTitle) {
+  return [{
+    link: routes.admin.adminPanel,
+    text: i18next.t("neetoRedirectUrls.settings.title")
+  }, {
+    link: utils.buildUrl(routes.admin.adminPanel, {
+      category: category.toLowerCase()
+    }),
+    text: SETTINGS_CATEGORIES_LABELS[category]
+  }].concat(_toConsumableArray(pageTitle ? [{
+    text: pageTitle
+  }] : []));
+};
+var normalizeURL = function normalizeURL(url) {
+  return url ? url.replace(/\/+$/, "") : "";
+};
+var handleError = function handleError(setStatus, error) {
+  var response = error.response;
+  if (response && response.data && response.data.errors) {
+    setStatus(response.data.errors);
+  }
+};
+
 var REDIRECT_URLS_BASE_URL = "/neeto_redirect_urls_engine/api/v1/redirect_urls";
 
 var fetch = function fetch() {
@@ -160,13 +250,16 @@ var fetch = function fetch() {
 var fetchAll = function fetchAll(params) {
   return axios.get(REDIRECT_URLS_BASE_URL, params);
 };
-var create = function create(payload) {
-  return axios.post(REDIRECT_URLS_BASE_URL, payload);
+var create = function create(_ref) {
+  var payload = _ref.payload,
+    config = _ref.config;
+  return axios.post(REDIRECT_URLS_BASE_URL, payload, config);
 };
-var update = function update(_ref) {
-  var id = _ref.id,
-    payload = _ref.payload;
-  return axios.put("".concat(REDIRECT_URLS_BASE_URL, "/").concat(id), payload);
+var update = function update(_ref2) {
+  var id = _ref2.id,
+    payload = _ref2.payload,
+    config = _ref2.config;
+  return axios.put("".concat(REDIRECT_URLS_BASE_URL, "/").concat(id), payload, config);
 };
 var destroy = function destroy(id) {
   return axios["delete"]("".concat(REDIRECT_URLS_BASE_URL, "/").concat(id));
@@ -213,18 +306,22 @@ var DOC_BASE_URL = "https://help.".concat(globalProps.appName.toLowerCase(), ".c
 var CREATE_REDIRECT_URL_HELP_DOC_URL = "".concat(DOC_BASE_URL, "/creating-a-redirect-url");
 var DOMAIN_LEVEL_REDIRECT_HELP_DOC_URL = "".concat(DOC_BASE_URL, "/domain-level-redirection");
 
-var DOMAIN_REDIRECTION_VALIDATION_SCHEMA = Yup__namespace.object().shape({
-  toPath: Yup__namespace.string().nullable().when("domainRedirectionActive", {
+var DOMAIN_REDIRECTION_VALIDATION_SCHEMA = yup__namespace.object().shape({
+  toPath: yup__namespace.string().nullable().when("domainRedirectionActive", {
     is: true,
-    then: Yup__namespace.string().required(i18next.t("neetoRedirectUrls.redirect.validations.required", {
+    then: yup__namespace.string().required(i18next.t("neetoRedirectUrls.redirect.validations.required", {
       entity: "Destination"
-    })).matches(URL_WITH_PROTOCOL_REGEX, i18next.t("neetoRedirectUrls.redirect.validations.destination")).notOneOf([location.origin], i18next.t("neetoRedirectUrls.redirect.validations.duplicateDomain"))
+    })).matches(constants.VALID_URL_REGEX, i18next.t("neetoRedirectUrls.redirect.validations.destination")).test("not-duplicate-domain", i18next.t("neetoRedirectUrls.redirect.validations.duplicateDomain"), function (value) {
+      if (!value) return true;
+      return normalizeURL(value) !== normalizeURL(location.origin);
+    })
   })
 });
 
 var DomainRedirection = function DomainRedirection(_ref) {
   var domainRedirectUrl = _ref.domainRedirectUrl,
-    entity = _ref.entity;
+    entity = _ref.entity,
+    helpDocUrls = _ref.helpDocUrls;
   var _useState = react.useState(true),
     _useState2 = _slicedToArray(_useState, 2),
     isEditingDomainRedirect = _useState2[0],
@@ -249,7 +346,9 @@ var DomainRedirection = function DomainRedirection(_ref) {
     return domainRedirectUrl ? updateLink({
       id: domainRedirectUrl.id,
       payload: payload
-    }) : createLink(payload);
+    }) : createLink({
+      payload: payload
+    });
   };
   var handleRemoveRedirection = function handleRemoveRedirection(domainLinkActive) {
     if (!(domainLinkActive && domainRedirectUrl)) {
@@ -308,9 +407,9 @@ var DomainRedirection = function DomainRedirection(_ref) {
                   Link: /*#__PURE__*/jsxRuntime.jsx(Button, {
                     className: "text-sm",
                     "data-cy": "domain-level-redirections-help-button",
-                    href: DOMAIN_LEVEL_REDIRECT_HELP_DOC_URL,
                     style: "link",
-                    target: "_blank"
+                    target: "_blank",
+                    href: helpDocUrls.domainLevelRedirectUrl || DOMAIN_LEVEL_REDIRECT_HELP_DOC_URL
                   })
                 }
               })
@@ -351,102 +450,6 @@ var DomainRedirection = function DomainRedirection(_ref) {
   });
 };
 
-var SETTINGS_CATEGORIES = {
-  GENERAL: "GENERAL"
-};
-var SETTINGS_CATEGORIES_LABELS = _defineProperty({}, SETTINGS_CATEGORIES.GENERAL, i18next.t("neetoRedirectUrls.settings.general.title"));
-
-var routes = {
-  admin: {
-    index: "/admin",
-    courses: {
-      chapters: {
-        show: "/admin/courses/:courseId/chapters/:chapterId",
-        chapterVersions: {
-          show: "/admin/courses/:courseId/chapters/:chapterId/chapter-versions/:chapterVersionId"
-        },
-        pages: {
-          show: "/admin/courses/:courseId/chapters/:chapterId/pages/:pageId",
-          pageVersions: {
-            show: "/admin/courses/:courseId/chapters/:chapterId/pages/:pageId/page-versions/:pageVersionId"
-          }
-        }
-      },
-      index: "/admin/courses",
-      show: "/admin/courses/:courseId",
-      deployments: {
-        index: "/admin/courses/:courseId/deployments",
-        show: "/admin/courses/:courseId/deployments/:deploymentId"
-      },
-      configure: {
-        index: "/admin/courses/:courseId/configure",
-        security: "/admin/courses/:courseId/configure/security",
-        certificateConfiguration: "/admin/courses/:courseId/configure/certificate_configuration"
-      }
-    },
-    pullRequestApps: {
-      index: "/admin/pull_request_apps",
-      show: "/admin/pull_request_apps/:pullRequestAppId",
-      courseDeployments: {
-        show: "/admin/pull_request_apps/:pullRequestAppId/course-deployments/:courseDeploymentId"
-      }
-    },
-    members: "/admin/members",
-    settings: {
-      index: "/admin/settings",
-      general: {
-        apiSettings: "/admin/settings/general/api-settings",
-        redirectUrls: "/admin/settings/general/redirect-urls",
-        basicInfos: "/admin/settings/general/basic-infos",
-        customDomains: {
-          index: "/admin/settings/general/custom-domains"
-        },
-        security: {
-          index: "/admin/settings/general/security"
-        },
-        roles: "/admin/settings/general/roles"
-      },
-      integrations: {
-        index: "/admin/settings/integrations",
-        stripe: {
-          index: "/admin/settings/integrations/stripe",
-          manage: "/admin/settings/integrations/stripe/manage"
-        },
-        googleAnalytics: {
-          index: "/admin/settings/integrations/google-analytics",
-          manage: "/admin/settings/integrations/google-analytics/manage"
-        }
-      }
-    },
-    reports: {
-      index: "/admin/reports",
-      invalidUrls: "/admin/reports/invalid-urls"
-    },
-    assets: {
-      index: "/admin/assets",
-      databases: "/admin/assets/databases",
-      videos: "/admin/assets/videos",
-      audios: "/admin/assets/audios",
-      resources: "/admin/assets/resources"
-    }
-  },
-  home: "/"
-};
-
-var buildSettingsBreadcrumbs = function buildSettingsBreadcrumbs(category, pageTitle) {
-  return [{
-    link: routes.admin.settings.index,
-    text: i18next.t("neetoRedirectUrls.settings.title")
-  }, {
-    link: utils.buildUrl(routes.admin.settings.index, {
-      category: category.toLowerCase()
-    }),
-    text: SETTINGS_CATEGORIES_LABELS[category]
-  }].concat(_toConsumableArray(pageTitle ? [{
-    text: pageTitle
-  }] : []));
-};
-
 var buildBreadcrumbs = function buildBreadcrumbs(pageTitle) {
   return buildSettingsBreadcrumbs(SETTINGS_CATEGORIES.GENERAL, pageTitle);
 };
@@ -550,7 +553,9 @@ var RedirectUrlsTable = function RedirectUrlsTable(_ref) {
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var RedirectUrls = function RedirectUrls(_ref) {
-  var entity = _ref.entity;
+  var entity = _ref.entity,
+    _ref$helpDocUrls = _ref.helpDocUrls,
+    helpDocUrls = _ref$helpDocUrls === void 0 ? {} : _ref$helpDocUrls;
   var _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
   var _useQueryParams = reactUtils.useQueryParams(),
@@ -595,18 +600,38 @@ var RedirectUrls = function RedirectUrls(_ref) {
     updateRedirectUrl = _useUpdateRedirectUrl.mutate;
   var _useDestroyRedirectUr = useDestroyRedirectUrl(),
     deleteRedirectUrl = _useDestroyRedirectUr.mutate;
-  var handleCreateRedirectUrl = function handleCreateRedirectUrl(redirectUrl) {
-    createRedirectUrl(redirectUrl, {
+  var handleCreateRedirectUrl = function handleCreateRedirectUrl(redirectUrl, _ref2) {
+    var setSubmitting = _ref2.setSubmitting,
+      setStatus = _ref2.setStatus;
+    createRedirectUrl({
+      payload: redirectUrl,
+      config: SHOW_TOASTR_CONFIG
+    }, {
+      onError: function onError(error) {
+        handleError(setStatus, error);
+        setSubmitting(false);
+      },
       onSuccess: function onSuccess() {
+        utils.showThumbsUpToastr();
         setIsModalOpen(false);
       }
     });
   };
-  var handleRedirectUrlUpdate = function handleRedirectUrlUpdate(redirectUrl) {
+  var handleRedirectUrlUpdate = function handleRedirectUrlUpdate(redirectUrl, _ref3) {
+    var setSubmitting = _ref3.setSubmitting,
+      setStatus = _ref3.setStatus;
     updateRedirectUrl({
       id: redirectUrl.id,
-      payload: redirectUrl
+      payload: redirectUrl,
+      config: SHOW_TOASTR_CONFIG
     }, {
+      onError: function onError(error) {
+        handleError(setStatus, error);
+        setSubmitting(false);
+      },
+      onSuccess: function onSuccess() {
+        utils.showThumbsUpToastr();
+      },
       onSettled: function onSettled() {
         setUrlDetailsToEdit(null);
       }
@@ -648,9 +673,9 @@ var RedirectUrls = function RedirectUrls(_ref) {
               i18nKey: "neetoRedirectUrls.emptyState.redirectURLs.description",
               components: {
                 helpLink: /*#__PURE__*/jsxRuntime.jsx(Button, {
-                  href: CREATE_REDIRECT_URL_HELP_DOC_URL,
                   style: "link",
-                  target: "_blank"
+                  target: "_blank",
+                  href: helpDocUrls.createRedirectUrl || CREATE_REDIRECT_URL_HELP_DOC_URL
                 })
               }
             }),
@@ -666,7 +691,8 @@ var RedirectUrls = function RedirectUrls(_ref) {
             className: "w-full",
             children: /*#__PURE__*/jsxRuntime.jsx(DomainRedirection, {
               domainRedirectUrl: domainRedirectUrl,
-              entity: entity
+              entity: entity,
+              helpDocUrls: helpDocUrls
             })
           }), /*#__PURE__*/jsxRuntime.jsx(RedirectUrlsTable, {
             currentPageNumber: currentPageNumber,