diff --git a/app/[locale]/(admin)/admin/content/audio-visual/components/pending-approval-columns.tsx b/app/[locale]/(admin)/admin/content/audio-visual/components/pending-approval-columns.tsx
index 43ea171..d1d00d7 100644
--- a/app/[locale]/(admin)/admin/content/audio-visual/components/pending-approval-columns.tsx
+++ b/app/[locale]/(admin)/admin/content/audio-visual/components/pending-approval-columns.tsx
@@ -186,7 +186,7 @@ const usePendingApprovalColumns = () => {
View
- {canApprove && (
+ {/* {canApprove && (
{
@@ -197,7 +197,7 @@ const usePendingApprovalColumns = () => {
Approve
- )}
+ )} */}
);
diff --git a/app/[locale]/(admin)/admin/content/audio/components/pending-approval-columns.tsx b/app/[locale]/(admin)/admin/content/audio/components/pending-approval-columns.tsx
index 7f66720..5a1baa6 100644
--- a/app/[locale]/(admin)/admin/content/audio/components/pending-approval-columns.tsx
+++ b/app/[locale]/(admin)/admin/content/audio/components/pending-approval-columns.tsx
@@ -186,7 +186,7 @@ const usePendingApprovalColumns = () => {
View
- {canApprove && (
+ {/* {canApprove && (
{
@@ -197,7 +197,7 @@ const usePendingApprovalColumns = () => {
Approve
- )}
+ )} */}
);
diff --git a/app/[locale]/(admin)/admin/content/document/components/pending-approval-columns.tsx b/app/[locale]/(admin)/admin/content/document/components/pending-approval-columns.tsx
index 8362ba4..200fee8 100644
--- a/app/[locale]/(admin)/admin/content/document/components/pending-approval-columns.tsx
+++ b/app/[locale]/(admin)/admin/content/document/components/pending-approval-columns.tsx
@@ -186,7 +186,7 @@ const usePendingApprovalColumns = () => {
View
- {canApprove && (
+ {/* {canApprove && (
{
@@ -197,7 +197,7 @@ const usePendingApprovalColumns = () => {
Approve
- )}
+ )} */}
);
diff --git a/app/[locale]/(admin)/admin/content/image/components/pending-approval-columns.tsx b/app/[locale]/(admin)/admin/content/image/components/pending-approval-columns.tsx
index 9ebe593..317536f 100644
--- a/app/[locale]/(admin)/admin/content/image/components/pending-approval-columns.tsx
+++ b/app/[locale]/(admin)/admin/content/image/components/pending-approval-columns.tsx
@@ -192,7 +192,7 @@ const usePendingApprovalColumns = () => {
View
- {canApprove && (
+ {/* {canApprove && (
{
@@ -203,7 +203,7 @@ const usePendingApprovalColumns = () => {
Approve
- )}
+ )} */}
);
diff --git a/components/form/content/audio-visual/video-detail-form.tsx b/components/form/content/audio-visual/video-detail-form.tsx
index 99a0d1c..c0cdc18 100644
--- a/components/form/content/audio-visual/video-detail-form.tsx
+++ b/components/form/content/audio-visual/video-detail-form.tsx
@@ -294,31 +294,19 @@ export default function FormVideoDetail() {
async function save() {
const data = {
- mediaUploadId: id,
- statusId: status,
+ action: status == "2" ? "approve" : status == "3" ? "revision" : "reject",
message: description,
- files: isUserMabesApprover ? getPlacement() : [],
};
+
setModalOpen(false);
loading();
- const response = await submitApproval(data);
+ const response = await submitApproval(id, data);
if (response?.error) {
error(response.message);
return false;
}
- const dataReject = {
- listFiles: rejectedFiles,
- };
-
- const resReject = await rejectFiles(dataReject);
-
- if (resReject?.error) {
- error(resReject.message);
- return false;
- }
-
close();
submitApprovalSuccesss();
@@ -403,7 +391,7 @@ export default function FormVideoDetail() {
confirmButtonText: "OK",
}).then((result) => {
if (result.isConfirmed) {
- router.push("/contributor/content/video");
+ router.push("/admin/content/video");
}
});
};
diff --git a/components/form/content/audio/audio-detail-form.tsx b/components/form/content/audio/audio-detail-form.tsx
index c8847b7..5340472 100644
--- a/components/form/content/audio/audio-detail-form.tsx
+++ b/components/form/content/audio/audio-detail-form.tsx
@@ -366,32 +366,19 @@ export default function FormAudioDetail() {
async function save() {
const data = {
- mediaUploadId: id,
- statusId: status,
+ action: status == "2" ? "approve" : status == "3" ? "revision" : "reject",
message: description,
- // files: [],
- files: isUserMabesApprover ? getPlacement() : [],
};
+
setModalOpen(false);
loading();
- const response = await submitApproval(data);
+ const response = await submitApproval(id, data);
if (response?.error) {
error(response.message);
return false;
}
- const dataReject = {
- listFiles: rejectedFiles,
- };
-
- const resReject = await rejectFiles(dataReject);
-
- if (resReject?.error) {
- error(resReject.message);
- return false;
- }
-
close();
submitApprovalSuccesss();
@@ -471,7 +458,7 @@ export default function FormAudioDetail() {
confirmButtonColor: "#3085d6",
confirmButtonText: "OK",
}).then(() => {
- router.push("/in/contributor/content/audio");
+ router.push("/admin/content/audio");
});
};
diff --git a/components/form/content/document/teks-detail-form.tsx b/components/form/content/document/teks-detail-form.tsx
index c02e616..b6df303 100644
--- a/components/form/content/document/teks-detail-form.tsx
+++ b/components/form/content/document/teks-detail-form.tsx
@@ -321,32 +321,19 @@ export default function FormTeksDetail() {
async function save() {
const data = {
- mediaUploadId: id,
- statusId: status,
+ action: status == "2" ? "approve" : status == "3" ? "revision" : "reject",
message: description,
- files: isUserMabesApprover ? getPlacement() : [],
};
- setModalOpen(false);
+ setModalOpen(false);
loading();
- const response = await submitApproval(data);
+ const response = await submitApproval(id, data);
if (response?.error) {
error(response.message);
return false;
}
- const dataReject = {
- listFiles: rejectedFiles,
- };
-
- const resReject = await rejectFiles(dataReject);
-
- if (resReject?.error) {
- error(resReject.message);
- return false;
- }
-
close();
submitApprovalSuccesss();
diff --git a/components/form/content/image/image-detail-form.tsx b/components/form/content/image/image-detail-form.tsx
index 9837565..1cec85e 100644
--- a/components/form/content/image/image-detail-form.tsx
+++ b/components/form/content/image/image-detail-form.tsx
@@ -452,34 +452,19 @@ export default function FormImageDetail() {
async function save() {
const data = {
- mediaUploadId: id,
- statusId: status,
+ action: status == "2" ? "approve" : status == "3" ? "revision" : "reject",
message: description,
- files: isUserMabesApprover ? getPlacement() : [],
};
setModalOpen(false);
loading();
- const response = await submitApproval(data);
+ const response = await submitApproval(id, data);
if (response?.error) {
error(response.message);
return false;
}
- const dataReject = {
- listFiles: rejectedFiles,
- };
-
- console.log("reject", dataReject);
-
- const resReject = await rejectFiles(dataReject);
-
- if (resReject?.error) {
- error(resReject.message);
- return false;
- }
-
close();
submitApprovalSuccesss();
@@ -551,7 +536,7 @@ export default function FormImageDetail() {
confirmButtonText: "OK",
}).then((result) => {
if (result.isConfirmed) {
- router.push("/contributor/content/image");
+ router.push("/admin/content/image");
}
});
};
diff --git a/next.config.mjs b/next.config.mjs
index 9b9d832..0c93552 100644
--- a/next.config.mjs
+++ b/next.config.mjs
@@ -97,6 +97,7 @@ const nextConfig = {
{ protocol: "https", hostname: "avatars.githubusercontent.com" },
{ protocol: "https", hostname: "i.pravatar.cc" },
{ protocol: "https", hostname: "dev.mikulnews.com" },
+ { protocol: "https", hostname: "kontenhumas.com" },
{ protocol: "https", hostname: "netidhub.com" },
],
},
diff --git a/service/content/content.ts b/service/content/content.ts
index 1699654..aeb9483 100644
--- a/service/content/content.ts
+++ b/service/content/content.ts
@@ -285,8 +285,8 @@ export async function convertSPIT(data: any) {
return httpPostInterceptor(url, data);
}
-export async function submitApproval(data: any) {
- const url = "media/approval";
+export async function submitApproval(id: string, data: any) {
+ const url = `article-approval-flows/articles/${id}/approve`;
return httpPostInterceptor(url, data);
}
diff --git a/service/landing/landing.ts b/service/landing/landing.ts
index c6075f4..e7a3055 100644
--- a/service/landing/landing.ts
+++ b/service/landing/landing.ts
@@ -176,7 +176,7 @@ export async function listArticles(
categoryId?: string,
sortBy = "createdAt"
) {
- let url = `articles?page=${page}&totalPage=${totalPage}`;
+ let url = `articles?page=${page}&totalPage=${totalPage}&isPublish=true`;
if (typeId !== undefined) url += `&typeId=${typeId}`;
if (search) url += `&title=${encodeURIComponent(search)}`;