@buerokratt-ria/menu 0.0.3 → 0.1.2

package/CHANGELOG.md

@@ -2,14 +2,10 @@
 
 All changes to this project will be documented in this file.
 
-## [0.0.3] - 20-12-2023
+## [0.1.2] - 01-02-2024
 
-- fixed styles imports
+- Added new element in menu /pending
 
-## [0.0.2] - 20-12-2023
+## [0.1.1] - 28-12-2023
 
-- Updated import to work as @buerokratt-ria/menu
-
-## [0.0.1] - 07-12-2023
-
-- Initial package structure for menu.
+- Initial package structure for menu for ruuter v2.

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@buerokratt-ria/menu",
-  "version": "0.0.3",
+  "version": "0.1.2",
   "description": "Generic MainNavigation component that would be injected as dependency.",
-  "main": "index.ts",
+  "main": "index.js",
   "scripts": {},
   "author": "ExiRain",
   "license": "ISC",

package/src/menu/data/menu-structure.json

@@ -21,6 +21,13 @@
         },
         "path": "/active"
       },
+      {
+        "label": {
+          "et": "Ootel",
+          "en": "Pending"
+        },
+        "path": "/pending"
+      },
       {
         "label": {
           "et": "Ajalugu",

package/src/menu/index.tsx

@@ -1,9 +1,8 @@
-import React, {FC, MouseEvent, useEffect, useState} from 'react';
+import React, {FC, MouseEvent, useState} from 'react';
 
 import {NavLink, useLocation} from 'react-router-dom';
-import {MdClose, MdKeyboardArrowDown, MdMiscellaneousServices} from 'react-icons/md';
 import clsx from 'clsx';
-import { MdOutlineForum, MdOutlineAdb, MdOutlineEqualizer, MdSettings, MdOutlineMonitorWeight } from 'react-icons/md';
+import { MdOutlineForum, MdOutlineAdb, MdOutlineEqualizer, MdClose, MdKeyboardArrowDown, MdMiscellaneousServices, MdSettings, MdOutlineMonitorWeight } from 'react-icons/md';
 import  Icon from './components/icons/icon/icon';
 import './main-navigation.scss';
 import { useQuery } from '@tanstack/react-query';
@@ -11,15 +10,15 @@ import {useTranslation} from "react-i18next";
 import menuStructure from './data/menu-structure.json';
 
 interface MenuItem {
-    id?: string;
-    label: TranslatedLabel;
-    path?: string;
-    target?: '_blank' | '_self';
-    children?: MenuItem[];
+  id?: string;
+  label: TranslatedLabel;
+  path?: string;
+  target?: '_blank' | '_self';
+  children?: MenuItem[];
 }
 
 interface TranslatedLabel {
-    [lang: string] : string;
+  [lang: string] : string;
 }
 
 const MainNavigation: FC<{items: MenuItem[], serviceId: string[]}> = ( {items, serviceId}) => {
@@ -66,23 +65,27 @@ const MainNavigation: FC<{items: MenuItem[], serviceId: string[]}> = ( {items, s
   let activeMenuId;
 
   const { data } = useQuery({
-    queryKey: ['cs-get-user-role', 'prod'],
+    queryKey: ['account/user-role', 'prod'],
     onSuccess: (res: any) => {
-      const filteredItems = items.filter((item) => {
-        const role = res.data.get_user[0].authorities[0]
-        switch (role) {
-          case 'ROLE_ADMINISTRATOR': return item.id
-          case 'ROLE_SERVICE_MANAGER': return item.id != 'settings' && item.id != 'training'
-          case 'ROLE_CUSTOMER_SUPPORT_AGENT': return item.id != 'settings' && item.id != 'analytics'
-          case 'ROLE_CHATBOT_TRAINER': return item.id != 'settings' && item.id != 'conversations'
-          case 'ROLE_ANALYST': return item.id == 'analytics'
-          case 'ROLE_UNAUTHENTICATED': return
-          default: return
-        }
-      }) ?? []
-      setMenuItems(filteredItems)
-    }
-
+      const filteredItems =
+          items.filter((item) => {
+            const role = res.response;
+            if (role.includes('ROLE_ADMINISTRATOR')) {
+              return item.id;
+            } else if (role.includes('ROLE_SERVICE_MANAGER')) {
+              return item.id != "settings" && item.id != "training";
+            } else if (role.includes('ROLE_CUSTOMER_SUPPORT_AGENT')) {
+              return item.id != "settings" && item.id != "analytics";
+            } else if (role.includes('ROLE_CHATBOT_TRAINER')) {
+              return item.id != "settings" && item.id != "conversations";
+            }  else if (role.includes('ROLE_ANALYST')) {
+              return item.id == "analytics" || item.id == "monitoring";
+            } else {
+              return;
+            }
+          }) ?? [];
+      setMenuItems(filteredItems);
+    },
   });
 
   const location = useLocation();
@@ -95,33 +98,33 @@ const MainNavigation: FC<{items: MenuItem[], serviceId: string[]}> = ( {items, s
 
   const renderMenuTree = (menuItems: MenuItem[]) => {
     return menuItems.map((menuItem) => (
-      <li key={menuItem.label[currentlySelectedLanguage]}>
-        {!!menuItem.children ? (
-          <>
-            <button
-              className={clsx('nav__toggle', { 'nav__toggle--icon': !!menuItem.id })}
-              aria-expanded={menuItem.path && (isSameRoot(menuItem)) ? 'true' : 'false'}
-              onClick={handleNavToggle}
-            >
-              { menuItem.id &&  (
-                <Icon icon={menuData.find(dataItem => dataItem.id === menuItem.id)?.icon} />
-              )}
-
-              <span>{menuItem.label[currentlySelectedLanguage]}</span>
-              <Icon icon={<MdKeyboardArrowDown />} />
-            </button>
-            <ul className='nav__submenu'>
-              {renderMenuTree(menuItem.children.map((item)  => ({id: menuItem.id, ...item})))}
-            </ul>
-          </>
-        ) : (
-
-          (serviceId.includes(menuItem.id)) ?
-            <NavLink to={menuItem.path || '#'}>{menuItem.label[currentlySelectedLanguage] }</NavLink> :
-            <a href={menuData.find(dataItem => dataItem.id === menuItem.id)?.url + menuItem.path}>{menuItem.label[currentlySelectedLanguage]}</a>
-
-        )}
-      </li>),
+        <li key={menuItem.label[currentlySelectedLanguage]}>
+          {!!menuItem.children ? (
+              <>
+                <button
+                    className={clsx('nav__toggle', { 'nav__toggle--icon': !!menuItem.id })}
+                    aria-expanded={menuItem.path && (isSameRoot(menuItem)) ? 'true' : 'false'}
+                    onClick={handleNavToggle}
+                >
+                  { menuItem.id &&  (
+                      <Icon icon={menuData.find(dataItem => dataItem.id === menuItem.id)?.icon} />
+                  )}
+
+                  <span>{menuItem.label[currentlySelectedLanguage]}</span>
+                  <Icon icon={<MdKeyboardArrowDown />} />
+                </button>
+                <ul className='nav__submenu'>
+                  {renderMenuTree(menuItem.children.map((item)  => ({id: menuItem.id, ...item})))}
+                </ul>
+              </>
+          ) : (
+
+              (serviceId.includes(menuItem.id)) ?
+                  <NavLink to={menuItem.path || '#'}>{menuItem.label[currentlySelectedLanguage] }</NavLink> :
+                  <a href={menuData.find(dataItem => dataItem.id === menuItem.id)?.url + menuItem.path}>{menuItem.label[currentlySelectedLanguage]}</a>
+
+          )}
+        </li>),
     );
   };
 
@@ -138,16 +141,16 @@ const MainNavigation: FC<{items: MenuItem[], serviceId: string[]}> = ( {items, s
   if (!menuItems) return null;
 
   return (
-    <nav className={clsx('nav', { 'nav--collapsed': navCollapsed })}>
-      <button className='nav__menu-toggle' onClick={() => setNavCollapsed(!navCollapsed)}>
-        <Icon icon={<MdClose />} />
-        {t('mainMenu.closeMenu')}
-      </button>
-      <ul className='nav__menu'>
-        {renderMenuTree(menuItems)}
-      </ul>
-    </nav>
+      <nav className={clsx('nav', { 'nav--collapsed': navCollapsed })}>
+        <button className='nav__menu-toggle' onClick={() => setNavCollapsed(!navCollapsed)}>
+          <Icon icon={<MdClose />} />
+          {t('mainMenu.closeMenu')}
+        </button>
+        <ul className='nav__menu'>
+          {renderMenuTree(menuItems)}
+        </ul>
+      </nav>
   );
 };
 
-export default MainNavigation;
+export default MainNavigation;