diff --git a/src/app/api/user/route.ts b/src/app/api/user/route.ts
index 526a4a7..fd9323f 100644
--- a/src/app/api/user/route.ts
+++ b/src/app/api/user/route.ts
@@ -47,6 +47,9 @@ export async function GET(request: Request) {
name: {
contains: (name == undefined || name == null) ? "" : name,
mode: "insensitive",
+ },
+ NOT: {
+ idUserRole: 'developer'
}
},
select: {
@@ -78,7 +81,7 @@ export async function GET(request: Request) {
const allData = users.map((v: any) => ({
..._.omit(v, ["Group", "Position"]),
group: v.Group.name,
- position: v.Position.name
+ position: v?.Position?.name
}))
return NextResponse.json({ success: true, message: "Berhasil member", data: allData, filter }, { status: 200 });
@@ -90,6 +93,9 @@ export async function GET(request: Request) {
name: {
contains: (name == undefined || name == null) ? "" : name,
mode: "insensitive",
+ },
+ NOT: {
+ idUserRole: 'developer'
}
},
select: {
@@ -121,7 +127,7 @@ export async function GET(request: Request) {
const allData = users.map((v: any) => ({
..._.omit(v, ["Group", "Position"]),
group: v.Group.name,
- position: v.Position.name
+ position: v?.Position?.name
}))
return NextResponse.json({ success: true, message: "Berhasil member", data: allData, filter }, { status: 200 });
diff --git a/src/module/home/ui/view_detail_feature.tsx b/src/module/home/ui/view_detail_feature.tsx
index 660f438..39c749e 100644
--- a/src/module/home/ui/view_detail_feature.tsx
+++ b/src/module/home/ui/view_detail_feature.tsx
@@ -30,7 +30,6 @@ export default function ViewDetailFeature() {
size={isMobile ? 50 : 68}
aria-label="Gradient action icon"
radius={100}
- // gradient={{ from: '#DFDA7C', to: '#F2AF46', deg: 174 }}
bg={tema.get().bgFiturHome}
>
@@ -46,7 +45,6 @@ export default function ViewDetailFeature() {
size={isMobile ? 50 : 68}
aria-label="Gradient action icon"
radius={100}
- // gradient={{ from: '#DFDA7C', to: '#F2AF46', deg: 174 }}
bg={tema.get().bgFiturHome}
>
@@ -62,7 +60,6 @@ export default function ViewDetailFeature() {
size={isMobile ? 50 : 68}
aria-label="Gradient action icon"
radius={100}
- // gradient={{ from: '#DFDA7C', to: '#F2AF46', deg: 174 }}
bg={tema.get().bgFiturHome}
>
@@ -78,7 +75,6 @@ export default function ViewDetailFeature() {
size={isMobile ? 50 : 68}
aria-label="Gradient action icon"
radius={100}
- // gradient={{ from: '#DFDA7C', to: '#F2AF46', deg: 174 }}
bg={tema.get().bgFiturHome}
>
@@ -94,7 +90,6 @@ export default function ViewDetailFeature() {
size={isMobile ? 50 : 68}
aria-label="Gradient action icon"
radius={100}
- // gradient={{ from: '#DFDA7C', to: '#F2AF46', deg: 174 }}
bg={tema.get().bgFiturHome}
>
@@ -110,7 +105,6 @@ export default function ViewDetailFeature() {
size={isMobile ? 50 : 68}
aria-label="Gradient action icon"
radius={100}
- // gradient={{ from: '#DFDA7C', to: '#F2AF46', deg: 174 }}
bg={tema.get().bgFiturHome}
>
@@ -128,7 +122,6 @@ export default function ViewDetailFeature() {
size={isMobile ? 50 : 68}
aria-label="Gradient action icon"
radius={100}
- // gradient={{ from: '#DFDA7C', to: '#F2AF46', deg: 174 }}
bg={tema.get().bgFiturHome}
>
@@ -140,7 +133,7 @@ export default function ViewDetailFeature() {
}
{
- roleLogin.get() == "supadmin" &&
+ (roleLogin.get() == "supadmin" || roleLogin.get() == "developer") &&
<>
router.push('/group')}>
@@ -148,7 +141,6 @@ export default function ViewDetailFeature() {
size={isMobile ? 50 : 68}
aria-label="Gradient action icon"
radius={100}
- // gradient={{ from: '#DFDA7C', to: '#F2AF46', deg: 174 }}
bg={tema.get().bgFiturHome}
>
@@ -164,7 +156,6 @@ export default function ViewDetailFeature() {
size={isMobile ? 50 : 68}
aria-label="Gradient action icon"
radius={100}
- // gradient={{ from: '#DFDA7C', to: '#F2AF46', deg: 174 }}
bg={tema.get().bgFiturHome}
>
@@ -180,7 +171,6 @@ export default function ViewDetailFeature() {
size={isMobile ? 50 : 68}
aria-label="Gradient action icon"
radius={100}
- // gradient={{ from: '#DFDA7C', to: '#F2AF46', deg: 174 }}
bg={tema.get().bgFiturHome}
>
diff --git a/src/module/position/ui/drawer_list_position.tsx b/src/module/position/ui/drawer_list_position.tsx
index 5eb48d9..9d4b630 100644
--- a/src/module/position/ui/drawer_list_position.tsx
+++ b/src/module/position/ui/drawer_list_position.tsx
@@ -99,7 +99,7 @@ export default function DrawerListPosition({ onCreated }: { onCreated: (val: boo
nilai = false
}
- if (roleLogin.get() == "supadmin" && (listData.idGroup == "" || String(listData.idGroup) == "null")) {
+ if ((roleLogin.get() == "supadmin" || roleLogin.get() == "developer") && (listData.idGroup == "" || String(listData.idGroup) == "null")) {
setTouched(touched => ({ ...touched, idGroup: true }))
nilai = false
}
@@ -140,7 +140,7 @@ export default function DrawerListPosition({ onCreated }: { onCreated: (val: boo
{
- roleLogin.get() == "supadmin" &&
+ (roleLogin.get() == "supadmin" || roleLogin.get() == "developer") &&
router.push('/position?page=filter&group=' + group)}>
@@ -155,7 +155,7 @@ export default function DrawerListPosition({ onCreated }: { onCreated: (val: boo
setOpenDrawerGroup(false)} title={'Tambah Jabatan'} size="md">
{
- roleLogin.get() == "supadmin" &&
+ (roleLogin.get() == "supadmin" || roleLogin.get() == "developer") &&
{
- roleLogin.get() === 'supadmin' &&
+ (roleLogin.get() === 'supadmin' || roleLogin.get() === 'developer') &&
{
diff --git a/src/module/user/member/ui/tab_list_member.tsx b/src/module/user/member/ui/tab_list_member.tsx
index e517c51..d6adb89 100644
--- a/src/module/user/member/ui/tab_list_member.tsx
+++ b/src/module/user/member/ui/tab_list_member.tsx
@@ -131,7 +131,7 @@ export default function TabListMember() {
onChange={(e) => setSearchQuery(e.target.value)}
my={20}
/>
- {roleLogin.get() == 'supadmin' && Filter : {nameGroup}}
+ {(roleLogin.get() == 'supadmin' || roleLogin.get() == 'developer') && Filter : {nameGroup}}
{loading
?
Array(6)