Tambah Role Customer Service

src/pages/App/DesktopLayout.js

@@ -25,7 +25,7 @@ import {
   DollarCircleOutlined,
   UsergroupAddOutlined,
   UnorderedListOutlined,
-  FormOutlined
+  FormOutlined,
 } from "@ant-design/icons";
 import { AppRoute, LINKS } from "../../routes/app";
 import { useStore } from "../../utils/useStore";
@@ -129,7 +129,8 @@ export const DesktopLayout = observer(() => {
             }}
           >
             <Menu>
-              {store.authentication.userData.role === "Admin" && (
+              {(store.authentication.userData.role === "Admin" ||
+                store.authentication.userData.role === "Customer Service") && (
                 <Menu.Item key="home">
                   <Link to={LINKS.HOME}>
                     <HomeOutlined />
@@ -145,7 +146,8 @@ export const DesktopLayout = observer(() => {
                   </Link>
                 </Menu.Item>
               )}
-              {store.authentication.userData.role === "Admin" && (
+              {(store.authentication.userData.role === "Admin" ||
+                store.authentication.userData.role === "Customer Service") && (
                 <SubMenu
                   key="keanggotaan"
                   icon={<UsergroupAddOutlined />}
@@ -201,7 +203,8 @@ export const DesktopLayout = observer(() => {
                   </Link>
                 </Menu.Item>
               )} */}
-              {store.authentication.userData.role === "Admin" && (
+              {(store.authentication.userData.role === "Admin" ||
+                store.authentication.userData.role === "Customer Service") && (
                 <SubMenu
                   key="config"
                   icon={<SettingOutlined />}
@@ -228,7 +231,8 @@ export const DesktopLayout = observer(() => {
                   </Menu.Item>
                 </SubMenu>
               )}
-              {store.authentication.userData.role === "Admin" && (
+              {(store.authentication.userData.role === "Admin" ||
+                store.authentication.userData.role === "Customer Service") && (
                 <SubMenu
                   key="product-main"
                   icon={<PieChartOutlined />}
@@ -308,14 +312,16 @@ export const DesktopLayout = observer(() => {
                       </Link>
                     </Menu.Item>
                   )}
-                  {store.authentication.userData.role !== "Admin" && (
-                    <Menu.Item key="payback-from-user">
-                      <Link to={LINKS.PAYBACK_CREATED}>
-                        <AlipayOutlined />
-                        <span>Dibuat oleh Saya</span>
-                      </Link>
-                    </Menu.Item>
-                  )}
+                  {store.authentication.userData.role !== "Admin" ||
+                    (store.authentication.userData.role !==
+                      "Customer Service" && (
+                      <Menu.Item key="payback-from-user">
+                        <Link to={LINKS.PAYBACK_CREATED}>
+                          <AlipayOutlined />
+                          <span>Dibuat oleh Saya</span>
+                        </Link>
+                      </Menu.Item>
+                    ))}
                 </SubMenu>
               )}
               {store.authentication.userData.role !== "Admin" && (

src/pages/App/MenuList.js

@@ -56,7 +56,8 @@ export const MenuList = observer((props) => {
       overflowedIndicator={0}
       forceSubMenuRender={true}
     >
-      {store.authentication.userData.role === "Admin" && (
+      {(store.authentication.userData.role === "Admin" ||
+        store.authentication.userData.role === "Customer Service") && (
         <Menu.Item key="home">
           <Link to={LINKS.HOME}>
             <HomeOutlined />
@@ -72,47 +73,48 @@ export const MenuList = observer((props) => {
           </Link>
         </Menu.Item>
       )}
-      {store.authentication.userData.role === "Admin" && (
-          <SubMenu
-            key="keanggotaan"
-            icon={<UsergroupAddOutlined />}
-            title="Keanggotaan"
-          >
-            <Menu.Item key="membership">
-              <Link to={LINKS.MEMBERSHIP}>
-                <UnorderedListOutlined />
-                <span>Daftar Anggota</span>
-              </Link>
-            </Menu.Item>
-            <Menu.Item key="konfirmasi">
-              <Link to={LINKS.KONFIRMASI}>
-                <FormOutlined />
-                <span>Konfirm Retail</span>
-              </Link>
-            </Menu.Item>
-          </SubMenu>
-        )}
-        {store.authentication.userData.role === "Supervisor" && (
-          <SubMenu
-            key="keanggotaan"
-            icon={<UsergroupAddOutlined />}
-            title="Keanggotaan"
-          >
-            <Menu.Item key="membership">
-              <Link to={LINKS.MEMBERSHIP}>
-                <UnorderedListOutlined />
-                <span>Daftar Anggota</span>
-              </Link>
-            </Menu.Item>
-            <Menu.Item key="konfirmasi">
-              <Link to={LINKS.KONFIRMASI}>
-                <FormOutlined />
-                <span>Konfirm Retail</span>
-              </Link>
-            </Menu.Item>
-          </SubMenu>
-        )}
-        {/* {store.authentication.userData.role === "Sales" && (
+      {(store.authentication.userData.role === "Admin" ||
+        store.authentication.userData.role === "Customer Service") && (
+        <SubMenu
+          key="keanggotaan"
+          icon={<UsergroupAddOutlined />}
+          title="Keanggotaan"
+        >
+          <Menu.Item key="membership">
+            <Link to={LINKS.MEMBERSHIP}>
+              <UnorderedListOutlined />
+              <span>Daftar Anggota</span>
+            </Link>
+          </Menu.Item>
+          <Menu.Item key="konfirmasi">
+            <Link to={LINKS.KONFIRMASI}>
+              <FormOutlined />
+              <span>Konfirm Retail</span>
+            </Link>
+          </Menu.Item>
+        </SubMenu>
+      )}
+      {store.authentication.userData.role === "Supervisor" && (
+        <SubMenu
+          key="keanggotaan"
+          icon={<UsergroupAddOutlined />}
+          title="Keanggotaan"
+        >
+          <Menu.Item key="membership">
+            <Link to={LINKS.MEMBERSHIP}>
+              <UnorderedListOutlined />
+              <span>Daftar Anggota</span>
+            </Link>
+          </Menu.Item>
+          <Menu.Item key="konfirmasi">
+            <Link to={LINKS.KONFIRMASI}>
+              <FormOutlined />
+              <span>Konfirm Retail</span>
+            </Link>
+          </Menu.Item>
+        </SubMenu>
+      )}
+      {/* {store.authentication.userData.role === "Sales" && (
           <SubMenu
             key="keanggotaan"
             icon={<UsergroupAddOutlined />}
@@ -142,7 +144,8 @@ export const MenuList = observer((props) => {
           </Link>
         </Menu.Item>
       )}
-      {store.authentication.userData.role === "Admin" && (
+      {(store.authentication.userData.role === "Admin" ||
+        store.authentication.userData.role === "Customer Service") && (
         <SubMenu key="config" icon={<SettingOutlined />} title="Config">
           <Menu.Item key="partner">
             <Link to={LINKS.PARTNER}>
@@ -164,7 +167,8 @@ export const MenuList = observer((props) => {
           </Menu.Item>
         </SubMenu>
       )}
-      {store.authentication.userData.role === "Admin" && (
+      {(store.authentication.userData.role === "Admin" ||
+        store.authentication.userData.role === "Customer Service") && (
         <SubMenu
           key="product-main"
           icon={<AppstoreAddOutlined />}
@@ -176,22 +180,20 @@ export const MenuList = observer((props) => {
               <span>Produk</span>
             </Link>
           </Menu.Item>
-          {store.authentication.userData.role === "Admin" && (
-            <Menu.Item key="sub-category">
-              <Link to={LINKS.SUBCATEGORY}>
-                <FileSyncOutlined />
-                <span>Sub Kategori</span>
-              </Link>
-            </Menu.Item>
-          )}
-          {store.authentication.userData.role === "Admin" && (
-            <Menu.Item key="category">
-              <Link to={LINKS.CATEGORY}>
-                <FileAddOutlined />
-                <span>Kategori</span>
-              </Link>
-            </Menu.Item>
-          )}
+
+          <Menu.Item key="sub-category">
+            <Link to={LINKS.SUBCATEGORY}>
+              <FileSyncOutlined />
+              <span>Sub Kategori</span>
+            </Link>
+          </Menu.Item>
+
+          <Menu.Item key="category">
+            <Link to={LINKS.CATEGORY}>
+              <FileAddOutlined />
+              <span>Kategori</span>
+            </Link>
+          </Menu.Item>
         </SubMenu>
       )}
       {store.authentication.userData.role === "Admin Partner" && (
@@ -240,14 +242,15 @@ export const MenuList = observer((props) => {
               </Link>
             </Menu.Item>
           )}
-          {store.authentication.userData.role !== "Admin" && (
-            <Menu.Item key="payback-from-user">
-              <Link to={LINKS.PAYBACK_CREATED}>
-                <FileProtectOutlined />
-                <span>Dibuat oleh Saya</span>
-              </Link>
-            </Menu.Item>
-          )}
+          {store.authentication.userData.role !== "Admin" ||
+            (store.authentication.userData.role !== "Customer Service" && (
+              <Menu.Item key="payback-from-user">
+                <Link to={LINKS.PAYBACK_CREATED}>
+                  <FileProtectOutlined />
+                  <span>Dibuat oleh Saya</span>
+                </Link>
+              </Menu.Item>
+            ))}
         </SubMenu>
       )}
       {store.authentication.userData.role !== "Admin" && (