Fixed chart.js peer dependency #348

Author: TarikHuber

packages/rmw-shell/cra-template-rmw/template/src/config/config.js

@@ -5,7 +5,11 @@ import themes from './themes'
 import parseLanguages from 'base-shell/lib/utils/locale'
 import grants from './grants'
 import Loading from 'material-ui-shell/lib/components/Loading/Loading'
-import { defaultUserData, isGranted } from 'rmw-shell/lib/utils/auth'
+import {
+  defaultUserData,
+  isGranted,
+  isAnyGranted,
+} from 'rmw-shell/lib/utils/auth'
 import { getDefaultRoutes } from './getDefaultRoutes'
 
 const config = {
@@ -105,6 +109,7 @@ const config = {
             notificationsDisabled: notifcationsDisabledSnap.val(),
             isAdmin: !!isAdminSnap.val(),
             isGranted,
+            isAnyGranted,
           })
 
           update(ref(db, `users/${user.uid}`), {

packages/rmw-shell/cra-template-rmw/template/src/config/getDefaultRoutes.js

@@ -13,6 +13,7 @@ const CreateChat = lazy(() => import('rmw-shell/lib/pages/CreateChat'))
 const GroupChat = lazy(() => import('rmw-shell/lib/pages/GroupChat'))
 const EditMembers = lazy(() => import('rmw-shell/lib/pages/EditMembers'))
 const EditAdmins = lazy(() => import('rmw-shell/lib/pages/EditAdmins'))
+const PageNotFound = lazy(() => import('../pages/PageNotFound'))
 
 const getDefaultRoutes = (appConfig) => {
   return [
@@ -164,7 +165,11 @@ const getDefaultRoutes = (appConfig) => {
     {
       path: '*',
 
-      element: appConfig?.pages?.PageNotFound,
+      element: (
+        <AuthorizedRoute>
+          <PageNotFound />
+        </AuthorizedRoute>
+      ),
     },
   ]
 }

packages/rmw-shell/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "rmw-shell",
-  "version": "11.0.9",
+  "version": "11.0.10",
   "description": "React template with Material UI, Firebase, routing...",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -25,7 +25,7 @@
     "jss-rtl": "0.x",
     "@formatjs/intl-relativetimeformat": "^7.0.0 || ^8.0.0 || ^9.0.0",
     "base-shell": "2.x",
-    "chart.js": "2.x",
+    "chart.js": "3.x",
     "final-form": "4.x",
     "final-form-arrays": "3.x",
     "firebase": "9.x",