Deskripsi:
- Fix notifikasi admin to user
- Fix trigger autoload
This commit is contained in:
2024-11-12 13:49:51 +08:00
parent aa612d24bc
commit 1b58ba7d90
15 changed files with 168 additions and 117 deletions

View File

@@ -4,6 +4,8 @@ import { Admin_NewLayout } from "@/app_modules/admin";
import adminNotifikasi_countNotifikasi from "@/app_modules/admin/notifikasi/fun/count/count_is_read";
import adminNotifikasi_getByUserId from "@/app_modules/admin/notifikasi/fun/get/get_notifikasi_by_user_id";
import React from "react";
import versionUpdate from "../../../../package.json";
export default async function Layout({
children,
@@ -11,6 +13,7 @@ export default async function Layout({
children: React.ReactNode;
}) {
const userLoginId = await funGetUserIdByToken();
const version = versionUpdate.version
const dataUser = await funGlobal_getUserById({ userId: userLoginId });
const listNotifikasi = await adminNotifikasi_getByUserId();
@@ -30,6 +33,7 @@ export default async function Layout({
user={dataUser as any}
countNotifikasi={countNotifikasi as any}
listNotifikasi={listNotifikasi as []}
version={version}
>
{children}
</Admin_NewLayout>

View File

@@ -5,6 +5,7 @@ import { TokenProvider } from "./lib/token";
import dotenv from "dotenv";
import { ServerEnv } from "./lib/server_env";
import { RealtimeProvider } from "./lib";
import { funGetUserIdByToken } from "@/app_modules/_global/fun/get";
dotenv.config({
path: ".env",
});
@@ -35,18 +36,20 @@ const envObject = {
};
ServerEnv.set(envObject);
export default function RootLayout({
export default async function RootLayout({
children,
}: {
children: React.ReactNode;
}) {
const userLoginId = await funGetUserIdByToken();
if (!token) return <>Require Token Storage</>;
return (
<RootStyleRegistry>
<MqttLoader />
<TokenProvider token={token} envObject={envObject} />
<RealtimeProvider />
{/* <MqttLoader />
<TokenProvider token={token} envObject={envObject} /> */}
<RealtimeProvider userLoginId={userLoginId} />
{children}
</RootStyleRegistry>
);

View File

@@ -21,3 +21,7 @@ export const gs_realtimeData = atom<IRealtimeData | null>(null);
export const gs_admin_ntf = atom<number>(0);
export const gs_user_ntf = atom<number>(0);
// job
export const gs_job_trigger = atom<boolean>(false)

View File

@@ -5,23 +5,29 @@ import { useAtom } from "jotai";
import { WibuRealtime } from "wibu-pkg";
import {
gs_admin_ntf,
gs_job_trigger,
gs_realtimeData,
gs_user_ntf,
IRealtimeData,
} from "./global_state";
export type TypeNotification = {
type: "message" | "notification"
type: "message" | "notification" | "trigger";
pushNotificationTo: "ADMIN" | "USER";
dataMessage?: IRealtimeData;
userLoginId?: string;
};
const WIBU_REALTIME_TOKEN: any = process.env.NEXT_PUBLIC_WIBU_REALTIME_TOKEN;
export default function RealtimeProvider() {
export default function RealtimeProvider({
userLoginId,
}: {
userLoginId: string;
}) {
const [dataRealtime, setDataRealtime] = useAtom(gs_realtimeData);
const [newAdminNtf, setNewAdminNtf] = useAtom(gs_admin_ntf);
const [newUserNtf, setNewUserNtf] = useAtom(gs_user_ntf);
const [triggerJob, setTriggerJob] = useAtom(gs_job_trigger);
useShallowEffect(() => {
WibuRealtime.init({
@@ -30,14 +36,21 @@ export default function RealtimeProvider() {
setNewAdminNtf((e) => e + 1);
}
if (data.type == "notification" && data.pushNotificationTo == "USER") {
if (
data.type == "notification" &&
data.pushNotificationTo == "USER" &&
data.dataMessage?.userId == userLoginId
) {
setNewUserNtf((e) => e + 1);
setDataRealtime(data.dataMessage as any);
}
if (data.type == "message") {
// console.log(data.dataMessage);
setDataRealtime(data.dataMessage as any);
if (
data.type == "trigger" &&
data.pushNotificationTo == "USER" &&
data.dataMessage?.kategoriApp == "JOB"
) {
setTriggerJob(true);
}
},
project: "hipmi",