Merge branch 'release/v2.5.0'

.env.example

@@ -1,4 +1,4 @@
-NEXT_PUBLIC_VERSION = "2.4.1"
+NEXT_PUBLIC_VERSION = "2.5.0"
 
 NEXT_PUBLIC_API_URL = "http://192.168.1.20:8888/server"
 NEXT_PUBLIC_SERVER_SOCKET_URL = "ws://192.168.1.20:3023"

src/app/(withAuth)/(dashboardLayout)/dashboard/monitoring/operator-dialogue/operator/page.js

@@ -7,7 +7,7 @@ export const metadata = {
 
 const Page = () => {
     return (
-        <WithPermission permission_name={["all"]}>
+        <WithPermission permission_name={["province_operator_dialogue"]}>
             <OperatorDialoguePage />
         </WithPermission>
     );

src/app/(withAuth)/(dashboardLayout)/dashboard/monitoring/operator-dialogue/supervisor/page.js

@@ -7,7 +7,7 @@ export const metadata = {
 
 const Page = () => {
     return (
-        <WithPermission permission_name={["all"]}>
+        <WithPermission permission_name={["supervise_operator_dialogue"]}>
             <OperatorDialoguePage />
         </WithPermission>
     );

src/app/(withAuth)/(dashboardLayout)/dashboard/monitoring/people-messages/operator/page.js

@@ -7,7 +7,7 @@ export const metadata = {
 
 const Page = () => {
     return (
-        <WithPermission permission_name={["all"]}>
+        <WithPermission permission_name={["province_people_message"]}>
             <PeopleMessagePage />
         </WithPermission>
     );

src/app/(withAuth)/(dashboardLayout)/dashboard/monitoring/people-messages/supervisor/page.js

@@ -7,7 +7,7 @@ export const metadata = {
 
 const Page = () => {
     return (
-        <WithPermission permission_name={["all"]}>
+        <WithPermission permission_name={["supervise_people_message"]}>
             <PeopleMessagePage />
         </WithPermission>
     );

src/app/(withAuth)/(dashboardLayout)/dashboard/monitoring/system-messages/operator/page.js

@@ -7,7 +7,7 @@ export const metadata = {
 
 const Page = () => {
     return (
-        <WithPermission permission_name={["all"]}>
+        <WithPermission permission_name={["province_system_message"]}>
             <SystemMessagesPage />
         </WithPermission>
     );

src/app/(withAuth)/(dashboardLayout)/dashboard/monitoring/system-messages/supervisor/page.js

@@ -7,7 +7,7 @@ export const metadata = {
 
 const Page = () => {
     return (
-        <WithPermission permission_name={["all"]}>
+        <WithPermission permission_name={["supervise_people_message"]}>
             <SystemMessagesPage />
         </WithPermission>
     );

src/app/(withAuth)/(dashboardLayout)/dashboard/province-reports/province-calls-report/page.js

@@ -7,7 +7,7 @@ export const metadata = {
 
 const Page = () => {
     return (
-        <WithPermission permission_name={["all"]}>
+        <WithPermission permission_name={["province_reports"]}>
             <ProvinceCumulativeCallsReportPage />
         </WithPermission>
     );

src/app/(withAuth)/(dashboardLayout)/dashboard/province-reports/province-detailed-report/page.js

@@ -7,7 +7,7 @@ export const metadata = {
 
 const Page = () => {
     return (
-        <WithPermission permission_name={["all"]}>
+        <WithPermission permission_name={["province_reports"]}>
             <ProvinceDetailedLogsReportPage />
         </WithPermission>
     );

src/app/(withAuth)/(dashboardLayout)/dashboard/province-reports/province-messages-report/page.js

@@ -7,7 +7,7 @@ export const metadata = {
 
 const Page = () => {
     return (
-        <WithPermission permission_name={["all"]}>
+        <WithPermission permission_name={["province_reports"]}>
             <ProvincePeopleMessagesReportPage />
         </WithPermission>
     );

src/app/(withAuth)/(dashboardLayout)/dashboard/province-reports/province-operators-performance-report/page.js

@@ -7,7 +7,7 @@ export const metadata = {
 
 const Page = () => {
     return (
-        <WithPermission permission_name={["all"]}>
+        <WithPermission permission_name={["province_reports"]}>
             <ProvinceOperatorPerformanceReportPage />
         </WithPermission>
     );

src/app/(withAuth)/(dashboardLayout)/dashboard/reports/country-calls-report/page.js

@@ -7,7 +7,7 @@ export const metadata = {
 
 const Page = () => {
     return (
-        <WithPermission permission_name={["all"]}>
+        <WithPermission permission_name={["country_calls_report"]}>
             <CountryCallsReportPage />
         </WithPermission>
     );

src/app/(withAuth)/(dashboardLayout)/dashboard/reports/country-keypress-report/page.js

@@ -7,7 +7,7 @@ export const metadata = {
 
 const Page = () => {
     return (
-        <WithPermission permission_name={["all"]}>
+        <WithPermission permission_name={["country_keypress_report"]}>
             <CountryKeyPressReportPage />
         </WithPermission>
     );

src/app/(withAuth)/(dashboardLayout)/dashboard/reports/country-message-rating-report/page.js

@@ -7,7 +7,7 @@ export const metadata = {
 
 const Page = () => {
     return (
-        <WithPermission permission_name={["all"]}>
+        <WithPermission permission_name={["country_message_rating"]}>
             <CountryMessageRatingReportPage />
         </WithPermission>
     );

src/app/(withAuth)/(dashboardLayout)/dashboard/reports/country-voice-rating-report/page.js

@@ -7,7 +7,7 @@ export const metadata = {
 
 const Page = () => {
     return (
-        <WithPermission permission_name={["all"]}>
+        <WithPermission permission_name={["country_voice_rating"]}>
             <CountryVoiceRatingReportPage />
         </WithPermission>
     );

src/core/utils/pageMenu.js

@@ -35,7 +35,7 @@ export const pageMenu = [
                 type: "page",
                 icon: <ZoomInMapIcon sx={{ width: "inherit", height: "inherit" }} />,
                 route: "/dashboard/reports/country-calls-report",
-                permissions: ["all"],
+                permissions: ["country_calls_report"],
             },
             {
                 id: "reports-countryVoiceRatingReport",
@@ -43,7 +43,7 @@ export const pageMenu = [
                 type: "page",
                 icon: <StarIcon sx={{ width: "inherit", height: "inherit" }} />,
                 route: "/dashboard/reports/country-voice-rating-report",
-                permissions: ["all"],
+                permissions: ["country_voice_rating"],
             },
             {
                 id: "reports-countryMessageRatingReport",
@@ -51,7 +51,7 @@ export const pageMenu = [
                 type: "page",
                 icon: <MarkEmailReadIcon sx={{ width: "inherit", height: "inherit" }} />,
                 route: "/dashboard/reports/country-message-rating-report",
-                permissions: ["all"],
+                permissions: ["country_message_rating"],
             },
             {
                 id: "reports-countryKeypressReport",
@@ -59,7 +59,7 @@ export const pageMenu = [
                 type: "page",
                 icon: <TtyIcon sx={{ width: "inherit", height: "inherit" }} />,
                 route: "/dashboard/reports/country-keypress-report",
-                permissions: ["all"],
+                permissions: ["country_keypress_report"],
             },
         ],
     },
@@ -77,7 +77,7 @@ export const pageMenu = [
                 type: "page",
                 icon: <ZoomInMapIcon sx={{ width: "inherit", height: "inherit" }} />,
                 route: "/dashboard/province-reports/province-calls-report",
-                permissions: ["all"],
+                permissions: ["province_reports"],
             },
             {
                 id: "province-messages-reports",
@@ -85,7 +85,7 @@ export const pageMenu = [
                 type: "page",
                 icon: <MarkEmailReadIcon sx={{ width: "inherit", height: "inherit" }} />,
                 route: "/dashboard/province-reports/province-messages-report",
-                permissions: ["all"],
+                permissions: ["province_reports"],
             },
             {
                 id: "province-detailed-reports",
@@ -93,7 +93,7 @@ export const pageMenu = [
                 type: "page",
                 icon: <ContentPasteSearchIcon sx={{ width: "inherit", height: "inherit" }} />,
                 route: "/dashboard/province-reports/province-detailed-report",
-                permissions: ["all"],
+                permissions: ["province_reports"],
             },
             {
                 id: "province-operators-performance-reports",
@@ -101,7 +101,7 @@ export const pageMenu = [
                 type: "page",
                 icon: <SupervisorAccountIcon sx={{ width: "inherit", height: "inherit" }} />,
                 route: "/dashboard/province-reports/province-operators-performance-report",
-                permissions: ["all"],
+                permissions: ["province_reports"],
             },
         ],
     },
@@ -143,7 +143,7 @@ export const pageMenu = [
                 type: "page",
                 icon: <VoiceChatIcon sx={{ width: "inherit", height: "inherit" }} />,
                 route: "/dashboard/monitoring/operator-dialogue/supervisor",
-                permissions: ["all"],
+                permissions: ["supervise_operator_dialogue"],
             },
             {
                 id: "monitoring-operator-dialogue-operator",
@@ -151,7 +151,7 @@ export const pageMenu = [
                 type: "page",
                 icon: <VoiceChatIcon sx={{ width: "inherit", height: "inherit" }} />,
                 route: "/dashboard/monitoring/operator-dialogue/operator",
-                permissions: ["all"],
+                permissions: ["province_operator_dialogue"],
             },
             {
                 id: "monitoring-system-messages-supervisor",
@@ -159,7 +159,7 @@ export const pageMenu = [
                 type: "page",
                 icon: <PointOfSaleIcon sx={{ width: "inherit", height: "inherit" }} />,
                 route: "/dashboard/monitoring/system-messages/supervisor",
-                permissions: ["all"],
+                permissions: ["supervise_system_message"],
             },
             {
                 id: "monitoring-system-messages-operator",
@@ -167,7 +167,7 @@ export const pageMenu = [
                 type: "page",
                 icon: <PointOfSaleIcon sx={{ width: "inherit", height: "inherit" }} />,
                 route: "/dashboard/monitoring/system-messages/operator",
-                permissions: ["all"],
+                permissions: ["province_system_message"],
             },
             {
                 id: "monitoring-people-messages-supervisor",
@@ -175,7 +175,7 @@ export const pageMenu = [
                 type: "page",
                 icon: <ThreePIcon sx={{ width: "inherit", height: "inherit" }} />,
                 route: "/dashboard/monitoring/people-messages/supervisor",
-                permissions: ["all"],
+                permissions: ["supervise_people_message"],
             },
             {
                 id: "monitoring-people-messages-operator",
@@ -183,7 +183,7 @@ export const pageMenu = [
                 type: "page",
                 icon: <ThreePIcon sx={{ width: "inherit", height: "inherit" }} />,
                 route: "/dashboard/monitoring/people-messages/operator",
-                permissions: ["all"],
+                permissions: ["province_people_message"],
             },
         ],
     },