Dev to release

LICENSE.CustomLicenses

@@ -0,0 +1 @@
+Custom licenses are available upon agreement via Github Sponsorships. Custom licenses will not have to be published in this repository. All contributors automatically agree with this provision.

src/App.js

@@ -6,6 +6,9 @@ import routes from 'src/routes'
 import { Helmet } from 'react-helmet'
 import adminRoutes from './adminRoutes'
 import Skeleton from 'react-loading-skeleton'
+import TimeAgo from 'javascript-time-ago'
+import en from 'javascript-time-ago/locale/en.json'
+TimeAgo.addDefaultLocale(en)
 
 // Containers
 const DefaultLayout = React.lazy(() => import('./layout/DefaultLayout'))

src/components/layout/AppFooter.js

@@ -16,7 +16,7 @@ const AppFooter = () => {
           </CLink>{' '}
           <CLink href="https://datto.com/">
             <CImage src={dattoLogo} alt="Datto" />
-          </CLink>
+          </CLink>{' '}
           <CLink href="https://rewst.io/">
             <CImage src={rewstLogo} alt="Datto" />
           </CLink>

src/components/layout/AppHeader.js

@@ -72,6 +72,7 @@ const AppHeader = () => {
       </CHeader>
 
       {dashboard &&
+        dashboard.length >= 1 &&
         dashboard.map((item, index) => (
           <div
             className="mb-3"

src/components/tables/CellDate.js

@@ -2,9 +2,6 @@ import React from 'react'
 import moment from 'moment'
 import PropTypes from 'prop-types'
 import { CTooltip } from '@coreui/react'
-import TimeAgo from 'javascript-time-ago'
-import en from 'javascript-time-ago/locale/en.json'
-TimeAgo.addDefaultLocale(en)
 import ReactTimeAgo from 'react-time-ago'
 
 /**

src/components/tables/CippTable.js

@@ -329,8 +329,10 @@ export default function CippTable({
 
     if (!disablePDFExport || !disableCSVExport) {
       const keys = []
+      const exportFormatter = {}
       columns.map((col) => {
         if (col.exportSelector) keys.push(col.exportSelector)
+        if (col.exportFormatter) exportFormatter[col.exportSelector] = col.exportFormatter
         return null
       })
 
@@ -340,15 +342,22 @@ export default function CippTable({
         keys.reduce((acc, curr) => {
           const key = curr.split('/')
           if (key.length > 1) {
-            const parent = key[0]
-            const subkey = key[1]
-            if (obj[parent] !== null && obj[parent][subkey] !== null) {
-              acc[curr] = obj[parent][subkey]
-            } else {
-              acc[curr] = 'n/a'
+            var property = obj
+            for (var x = 0; x < key.length; x++) {
+              if (property[key[x]] !== null) {
+                property = property[key[x]]
+              } else {
+                property = 'n/a'
+                break
+              }
             }
+            acc[curr] = property
           } else {
-            acc[curr] = obj[curr]
+            if (typeof exportFormatter[curr] === 'function') {
+              acc[curr] = exportFormatter[curr]({ cell: obj[curr] })
+            } else {
+              acc[curr] = obj[curr]
+            }
           }
           return acc
         }, {}),

src/components/utilities/CippActionsOffcanvas.js

@@ -19,10 +19,6 @@ import { CippOffcanvasTable } from 'src/components/tables'
 import { useLazyGenericGetRequestQuery, useLazyGenericPostRequestQuery } from 'src/store/api/app'
 import { Link, useNavigate } from 'react-router-dom'
 import { stringCamelCase } from 'src/components/utilities/CippCamelCase'
-import TimeAgo from 'javascript-time-ago'
-
-import en from 'javascript-time-ago/locale/en.json'
-TimeAgo.addDefaultLocale(en)
 import ReactTimeAgo from 'react-time-ago'
 
 export default function CippActionsOffcanvas(props) {

src/components/utilities/Toasts.js

@@ -45,20 +45,10 @@ const Toast = ({ message, title, onClose, error }) => {
       <CToastBody>
         <div className="d-flex justify-content-between align-items-center text-danger">
           <strong>{message}</strong>
-          <CButton size="sm" variant="outline" color="primary" onClick={() => setVisible(!visible)}>
-            Details
-            <FontAwesomeIcon
-              className="ms-1"
-              size="1x"
-              icon={visible ? faCompressAlt : faExpandAlt}
-            />
-          </CButton>
         </div>
-        <CCollapse visible={visible}>
-          <pre>
-            {error?.status} - {error?.message}
-          </pre>
-        </CCollapse>
+        <pre>
+          {error?.status} - {error?.message}
+        </pre>
       </CToastBody>
     </CToast>
   )