@bigbinary/neeto-approvals-frontend 0.0.8 → 0.0.10

package/dist/index.esm.js

@@ -2,7 +2,7 @@ import * as t$2 from 'react';
 import t__default, { createContext, useContext, useState, useRef, useEffect, useMemo, forwardRef, useImperativeHandle, cloneElement, useLayoutEffect } from 'react';
 import { Header, SubHeader, MenuBar, Container } from '@bigbinary/neetoui/layouts';
 import { useLocation, useHistory, useParams, Switch, Route, Redirect } from 'react-router-dom';
-import { isEmpty, assoc, curryN, isNil, curry, complement, either, toPairs, pipe, omit, fromPairs, keys, identical, modify } from 'ramda';
+import { isEmpty, assoc, curryN, isNil, curry, complement, either, toPairs, pipe, omit, fromPairs, keys, modify } from 'ramda';
 import classnames from 'classnames';
 import { Typography, Pane, Button, Dropdown, PageLoader, Table, Alert, Tag, Spinner, Kbd, Avatar, Label, Tooltip, Input as Input$1, Toastr, Modal, Tab, Select as Select$1 } from '@bigbinary/neetoui';
 import axios from 'axios';
@@ -4984,12 +4984,6 @@ var nullSafe$1 = function nullSafe(func) {
   );
 };
 var noop = function noop() {};
-var toLabelAndValue = function toLabelAndValue(string) {
-  return {
-    label: string,
-    value: string
-  };
-};
 var isNotEmpty = /*#__PURE__*/complement(isEmpty);
 var isNotPresent = /*#__PURE__*/either(isNil, isEmpty);
 var isPresent = /*#__PURE__*/complement(isNotPresent);
@@ -7778,7 +7772,7 @@ const HISTORY_TABLE_COLUMNS = [{
   title: t$1("common.id"),
   render: (approvalLabel, _ref) => {
     let requestableUrl = _ref.requestableUrl;
-    const url = new URL(requestableUrl);
+    const url = new URL(requestableUrl || window.location.origin);
     return /*#__PURE__*/t__default.createElement(Button, {
       to: url.pathname,
       label: approvalLabel,
@@ -8101,16 +8095,21 @@ const fetch$1 = params => axios.get(`${BASE_URL}/templates`, {
   params
 });
 const show$1 = id => axios.get(`${BASE_URL}/templates/${id}`);
-const create = payload => axios.post(`${BASE_URL}/templates`, payload);
-const update = _ref => {
-  let id = _ref.id,
+const create = _ref => {
+  let _ref$url = _ref.url,
+    url = _ref$url === void 0 ? BASE_URL : _ref$url,
     payload = _ref.payload;
-  return axios.put(`${BASE_URL}/templates/${id}`, {
-    template: payload
-  });
+  return axios.post(url, payload);
 };
-const destroy = _ref2 => {
-  let templateId = _ref2.templateId;
+const update = _ref2 => {
+  let id = _ref2.id,
+    payload = _ref2.payload,
+    _ref2$url = _ref2.url,
+    url = _ref2$url === void 0 ? BASE_URL : _ref2$url;
+  return axios.put(`${url}/${id}`, payload);
+};
+const destroy = _ref3 => {
+  let templateId = _ref3.templateId;
   return axios.delete(`${BASE_URL}/templates/${templateId}`);
 };
 const templatesApi = {
@@ -8187,7 +8186,11 @@ const columnData = _ref => {
     dataIndex: "visibility",
     key: "visibility",
     sorter: true,
-    title: instance.t("common.visibility")
+    title: instance.t("common.visibility"),
+    render: (_, _ref2) => {
+      let accessible = _ref2.accessible;
+      return accessible.label;
+    }
   }, {
     key: "actions",
     ellipsis: true,
@@ -8278,10 +8281,7 @@ const Templates = _ref => {
     label: t("common.add_", {
       what: t("common.approvalTemplate").toLocaleLowerCase()
     }),
-    onClick: () => {
-      setIsMenubarOpen(false);
-      history.push(`${approvalsPath}${routes.templates.new}`);
-    }
+    onClick: () => history.push(`${approvalsPath}${routes.templates.new}`)
   });
   if (isTemplateLoading) {
     return /*#__PURE__*/t__default.createElement("div", {
@@ -8346,26 +8346,16 @@ const TEMPLATE_FORM_INITIAL_VALUES = {
 };
 const TEMPLATE_FORM_VALIDATION_SCHEMA = yup.object().shape({
   name: yup.string().trim().required(t$1("validations.name")),
-  description: yup.string().trim().required(t$1("validations.description")),
   recipient: yup.object().required(t$1("validations.recipient")),
   message: yup.string().test("message", t$1("validations.message"), content => !fr(content)),
   variables: yup.array().of(yup.object().shape({
     variable: yup.string().trim().required(t$1("validations.variable"))
   }))
 });
-const VISIBILITY_OPTIONS = [{
+const SELF_VISIBILITY = {
   label: t$1("select.visibility.self"),
-  value: "Self"
-}, {
-  label: t$1("select.visibility.supportTeam"),
-  value: "Support team"
-}, {
-  label: t$1("select.visibility.managers"),
-  value: "Managers"
-}, {
-  label: t$1("select.visibility.financeTeam"),
-  value: "Finance team"
-}];
+  value: "self"
+};
 
 const DynamicBlock = () => {
   const _useTranslation = useTranslation(),
@@ -8373,11 +8363,12 @@ const DynamicBlock = () => {
   const _useFormikContext = useFormikContext(),
     _useFormikContext$val = _useFormikContext.values.variables,
     variables = _useFormikContext$val === void 0 ? [] : _useFormikContext$val;
-  const editorVariables = variables.map(_ref => {
+  const editorVariables = variables.map((_ref, index) => {
     let variable = _ref.variable;
+    const variableValue = variable || `variable_${index + 1}`;
     return {
-      key: variable,
-      label: variable
+      key: variableValue,
+      label: variableValue
     };
   });
   return /*#__PURE__*/t__default.createElement(t__default.Fragment, null, /*#__PURE__*/t__default.createElement("div", {
@@ -8428,7 +8419,8 @@ const Form$1 = _ref => {
     _ref$onSubmit = _ref.onSubmit,
     onSubmit = _ref$onSubmit === void 0 ? noop : _ref$onSubmit,
     _ref$isLoading = _ref.isLoading,
-    isLoading = _ref$isLoading === void 0 ? false : _ref$isLoading;
+    isLoading = _ref$isLoading === void 0 ? false : _ref$isLoading,
+    visibilityOptions = _ref.visibilityOptions;
   const history = useHistory();
   const _useTranslation = useTranslation(),
     t = _useTranslation.t;
@@ -8469,9 +8461,9 @@ const Form$1 = _ref => {
   }), /*#__PURE__*/t__default.createElement(Select, {
     name: "visibility",
     label: t("common.visibility"),
-    options: VISIBILITY_OPTIONS
+    options: [...visibilityOptions, SELF_VISIBILITY]
   })), /*#__PURE__*/t__default.createElement(DynamicBlock, null), /*#__PURE__*/t__default.createElement("div", {
-    className: "space-x-4"
+    className: "space-x-4 pb-6"
   }, /*#__PURE__*/t__default.createElement(Button, {
     label: t("buttons.saveChanges"),
     type: "submit",
@@ -8493,16 +8485,20 @@ const buildTemplatePayload = template => {
     let variable = _ref.variable;
     return [`variable${index + 1}`, variable];
   });
-  const payload = _objectSpread$3(_objectSpread$3({}, template), {}, {
-    visibility: visibility.value,
-    approverId: recipient.value,
-    variables: fromPairs(indexedVariables)
-  });
+  const payload = {
+    template: _objectSpread$3(_objectSpread$3({}, template), {}, {
+      accessibleId: visibility.value,
+      approverId: recipient.value,
+      variables: fromPairs(indexedVariables)
+    })
+  };
   return payload;
 };
 
 const Create = _ref => {
-  let approvalsPath = _ref.approvalsPath;
+  let approvalsPath = _ref.approvalsPath,
+    visibilityOptions = _ref.visibilityOptions,
+    templateUrl = _ref.templateUrl;
   const history = useHistory();
   const _useTranslation = useTranslation(),
     t = _useTranslation.t;
@@ -8511,7 +8507,10 @@ const Create = _ref => {
     isLoading = _useCreateTemplate.isLoading;
   const onSubmit = template => {
     const payload = buildTemplatePayload(template);
-    createTemplate(payload, {
+    createTemplate({
+      url: templateUrl,
+      payload
+    }, {
       onSuccess: () => history.push(`${approvalsPath}${routes.templates.index}`)
     });
   };
@@ -8525,7 +8524,8 @@ const Create = _ref => {
     }]
   }), /*#__PURE__*/t__default.createElement(Form$1, {
     onSubmit: onSubmit,
-    isLoading: isLoading
+    isLoading: isLoading,
+    visibilityOptions: visibilityOptions
   }));
 };
 
@@ -8533,7 +8533,9 @@ function ownKeys$2(object, enumerableOnly) { var keys = Object.keys(object); if
 function _objectSpread$2(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$2(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$2(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 const Edit = _ref => {
   var _template$recipient, _template$recipient2;
-  let approvalsPath = _ref.approvalsPath;
+  let approvalsPath = _ref.approvalsPath,
+    visibilityOptions = _ref.visibilityOptions,
+    templateUrl = _ref.templateUrl;
   const _useParams = useParams(),
     id = _useParams.id;
   const history = useHistory();
@@ -8556,7 +8558,8 @@ const Edit = _ref => {
     const payload = buildTemplatePayload(template);
     updateTemplate({
       id,
-      payload
+      payload,
+      url: templateUrl
     });
   };
   if (isFetchingTemplate) {
@@ -8573,10 +8576,11 @@ const Edit = _ref => {
       text: t("common.templates")
     }]
   }), /*#__PURE__*/t__default.createElement(Form$1, {
+    visibilityOptions: visibilityOptions,
     onSubmit: onSubmit,
     isLoading: isUpdating,
     initialData: _objectSpread$2(_objectSpread$2({}, template), {}, {
-      visibility: toLabelAndValue(template.visibility),
+      visibility: template.accessible.id,
       recipient: {
         label: (_template$recipient = template.recipient) === null || _template$recipient === void 0 ? void 0 : _template$recipient.name,
         value: (_template$recipient2 = template.recipient) === null || _template$recipient2 === void 0 ? void 0 : _template$recipient2.id
@@ -8618,7 +8622,7 @@ const Menu = _ref => {
   const _useTranslation = useTranslation(),
     t = _useTranslation.t;
   const category = (_pathname$split$ = pathname.split(routes.approvals)[1]) === null || _pathname$split$ === void 0 ? void 0 : _pathname$split$.toLocaleUpperCase();
-  const isActive = filter => approvalFilterKeys.includes(category) && identical(filter, category);
+  const isActive = filter => category.includes(filter);
   const getRoute = filter => `${approvalsPath}${filter.toLowerCase()}`;
   return /*#__PURE__*/t__default.createElement(MenuBar, {
     showMenu: isMenuOpen,
@@ -8635,7 +8639,7 @@ function ownKeys$1(object, enumerableOnly) { var keys = Object.keys(object); if
 function _objectSpread$1(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$1(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$1(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 const Approvals = _ref => {
   let config = _ref.config;
-  const _useState = useState(false),
+  const _useState = useState(true),
     _useState2 = _slicedToArray$2(_useState, 2),
     isMenubarOpen = _useState2[0],
     setIsMenubarOpen = _useState2[1];
@@ -8733,7 +8737,7 @@ const Form = _ref => {
     }, variables.map(variable => /*#__PURE__*/t__default.createElement(Input$1, {
       className: "w-full",
       key: variable,
-      label: capitalize$1(variable),
+      label: variable,
       value: variableValues[variable],
       onChange: event => {
         setVariableValues(assoc(variable, event.target.value));