fix: conflict when pull main

components/form/content/audio-detail-form.tsx

@@ -1868,12 +1868,37 @@ export default function FormAudioDetail() {
                 </DialogContent>
               </Dialog>
             </Card>
-            {Number(detail?.needApprovalFromLevel) == Number(userLevelId) ||
+            {Number(roleId) === 14 ? (
-           (detail?.needApprovalFromLevel && Number(userLevelNumber) == 1) || 
+              // 🔹 Jika roleId = 14, langsung tampilkan tombol tanpa pengecekan lain
-           (detail?.isInternationalMedia == true && 
+              <div className="flex flex-col gap-2 p-3">
-           detail?.isForwardFromNational == true &&
+                <Button
-           Number(detail?.statusId) == 1) ? (
+                  onClick={() => actionApproval("2")}
-              Number(detail?.uploadedById) == Number(userId) && Number(userLevelNumber) != 1  ? (
+                  color="primary"
+                  type="button"
+                >
+                  <Icon icon="fa:check" className="mr-3" />{" "}
+                  {t("accept", { defaultValue: "Accept" })}
+                </Button>
+                <Button
+                  onClick={() => actionApproval("3")}
+                  className="bg-orange-400 hover:bg-orange-300"
+                  type="button"
+                >
+                  <Icon icon="fa:comment-o" className="mr-3" />{" "}
+                  {t("revision", { defaultValue: "Revision" })}
+                </Button>
+                <Button
+                  onClick={() => actionApproval("4")}
+                  color="destructive"
+                  type="button"
+                >
+                  <Icon icon="fa:times" className="mr-3" />
+                  {t("reject", { defaultValue: "Reject" })}
+                </Button>
+              </div>
+            ) : Number(detail?.needApprovalFromLevel) ===
+              Number(userLevelId) ? (
+              Number(detail?.uploadedById) === Number(userId) ? (
                 ""
               ) : (
                 <div className="flex flex-col gap-2 p-3">
@@ -1906,6 +1931,41 @@ export default function FormAudioDetail() {
             ) : (
               ""
             )}
+
+            {/* {Number(detail?.needApprovalFromLevel) == Number(userLevelId) ? (
+              Number(detail?.uploadedById) == Number(userId) ? (
+                ""
+              ) : (
+                <div className="flex flex-col gap-2 p-3">
+                  <Button
+                    onClick={() => actionApproval("2")}
+                    color="primary"
+                    type="button"
+                  >
+                    <Icon icon="fa:check" className="mr-3" />{" "}
+                    {t("accept", { defaultValue: "Accept" })}
+                  </Button>
+                  <Button
+                    onClick={() => actionApproval("3")}
+                    className="bg-orange-400 hover:bg-orange-300"
+                    type="button"
+                  >
+                    <Icon icon="fa:comment-o" className="mr-3" />{" "}
+                    {t("revision", { defaultValue: "Revision" })}
+                  </Button>
+                  <Button
+                    onClick={() => actionApproval("4")}
+                    color="destructive"
+                    type="button"
+                  >
+                    <Icon icon="fa:times" className="mr-3" />
+                    {t("reject", { defaultValue: "Reject" })}
+                  </Button>
+                </div>
+              )
+            ) : (
+              ""
+            )} */}
           </div>
         </div>
       ) : (

components/form/content/image-detail-form.tsx

@@ -2127,8 +2127,73 @@ export default function FormImageDetail() {
                 </DialogContent>
               </Dialog>
             </Card>
-            {Number(detail?.needApprovalFromLevel) == Number(userLevelId) ||
+            {Number(roleId) === 14 ? (
-            (detail?.needApprovalFromLevel && Number(userLevelNumber) == 1) || 
+              // 🔹 Jika roleId = 14 → tampilkan tombol tanpa pengecekan tambahan
+              <div className="flex flex-col gap-2 p-3">
+                <Button
+                  onClick={() => actionApproval("2")}
+                  color="primary"
+                  type="button"
+                >
+                  <Icon icon="fa:check" className="mr-3" />
+                  {t("accept", { defaultValue: "Accept" })}
+                </Button>
+                <Button
+                  onClick={() => actionApproval("3")}
+                  className="bg-orange-400 hover:bg-orange-300"
+                  type="button"
+                >
+                  <Icon icon="fa:comment-o" className="mr-3" />{" "}
+                  {t("revision", { defaultValue: "Revision" })}
+                </Button>
+                <Button
+                  onClick={() => actionApproval("4")}
+                  color="destructive"
+                  type="button"
+                >
+                  <Icon icon="fa:times" className="mr-3" />
+                  {t("reject", { defaultValue: "Reject" })}
+                </Button>
+              </div>
+            ) : Number(detail?.needApprovalFromLevel) === Number(userLevelId) ||
+              (detail?.isInternationalMedia === true &&
+                detail?.isForwardFromNational === true &&
+                Number(detail?.statusId) === 1) ? (
+              Number(detail?.uploadedById) === Number(userId) ? (
+                ""
+              ) : (
+                <div className="flex flex-col gap-2 p-3">
+                  <Button
+                    onClick={() => actionApproval("2")}
+                    color="primary"
+                    type="button"
+                  >
+                    <Icon icon="fa:check" className="mr-3" />
+                    {t("accept", { defaultValue: "Accept" })}
+                  </Button>
+                  <Button
+                    onClick={() => actionApproval("3")}
+                    className="bg-orange-400 hover:bg-orange-300"
+                    type="button"
+                  >
+                    <Icon icon="fa:comment-o" className="mr-3" />{" "}
+                    {t("revision", { defaultValue: "Revision" })}
+                  </Button>
+                  <Button
+                    onClick={() => actionApproval("4")}
+                    color="destructive"
+                    type="button"
+                  >
+                    <Icon icon="fa:times" className="mr-3" />
+                    {t("reject", { defaultValue: "Reject" })}
+                  </Button>
+                </div>
+              )
+            ) : (
+              ""
+            )}
+
+            {/* {Number(detail?.needApprovalFromLevel) == Number(userLevelId) ||
             (detail?.isInternationalMedia == true &&
               detail?.isForwardFromNational == true &&
               Number(detail?.statusId) == 1) ? (
@@ -2164,7 +2229,7 @@ export default function FormImageDetail() {
               )
             ) : (
               ""
-            )}
+            )} */}
           </div>
         </div>
       ) : (

components/form/content/image-update-form.tsx

@@ -1711,7 +1711,6 @@ export default function FormImageUpdate() {
                   </div>
                 </div>
 
-                {/* Description section (stacked, auto overwrite English when translated) */}
                 <div className="py-3 space-y-2">
                   <div className="flex justify-between items-center">
                     <Label>
@@ -1730,6 +1729,7 @@ export default function FormImageUpdate() {
                               sourceLang: "ID",
                               targetLang: "EN",
                             });
+                            console.log("PPP", res)
 
                             if (!res.error) {
                               const resultText =

components/form/content/teks-detail-form.tsx

@@ -1862,12 +1862,36 @@ export default function FormTeksDetail() {
                 </DialogContent>
               </Dialog>
             </Card>
-            {Number(detail?.needApprovalFromLevel) == Number(userLevelId) ||
+            {Number(roleId) === 14 ? (
-            (detail?.needApprovalFromLevel && Number(userLevelNumber) == 1) ||
+              // 🔹 Jika roleId = 14 → tampilkan tombol langsung tanpa pengecekan tambahan
-            (detail?.isInternationalMedia == true &&
+              <div className="flex flex-col gap-2 p-3">
-              detail?.isForwardFromNational == true &&
+                <Button
-              Number(detail?.statusId) == 1) ? (
+                  onClick={() => actionApproval("2")}
-              Number(detail?.uploadedById) == Number(userId) && Number(userLevelNumber) != 1 ? (
+                  color="primary"
+                  type="button"
+                >
+                  <Icon icon="fa:check" className="mr-3" />{" "}
+                  {t("accept", { defaultValue: "Accept" })}
+                </Button>
+                <Button
+                  onClick={() => actionApproval("3")}
+                  className="bg-orange-400 hover:bg-orange-300"
+                  type="button"
+                >
+                  <Icon icon="fa:comment-o" className="mr-3" />{" "}
+                  {t("revision", { defaultValue: "Revision" })}
+                </Button>
+                <Button
+                  onClick={() => actionApproval("4")}
+                  color="destructive"
+                  type="button"
+                >
+                  <Icon icon="fa:times" className="mr-3" />
+                  {t("reject", { defaultValue: "Reject" })}
+                </Button>
+              </div>
+            ) : Number(detail?.needApprovalFromLevel) == Number(userLevelId) ? (
+              Number(detail?.uploadedById) == Number(userId) ? (
                 ""
               ) : (
                 <div className="flex flex-col gap-2 p-3">
@@ -1900,6 +1924,41 @@ export default function FormTeksDetail() {
             ) : (
               ""
             )}
+
+            {/* {Number(detail?.needApprovalFromLevel) == Number(userLevelId) ? (
+              Number(detail?.uploadedById) == Number(userId) ? (
+                ""
+              ) : (
+                <div className="flex flex-col gap-2 p-3">
+                  <Button
+                    onClick={() => actionApproval("2")}
+                    color="primary"
+                    type="button"
+                  >
+                    <Icon icon="fa:check" className="mr-3" />{" "}
+                    {t("accept", { defaultValue: "Accept" })}
+                  </Button>
+                  <Button
+                    onClick={() => actionApproval("3")}
+                    className="bg-orange-400 hover:bg-orange-300"
+                    type="button"
+                  >
+                    <Icon icon="fa:comment-o" className="mr-3" />{" "}
+                    {t("revision", { defaultValue: "Revision" })}
+                  </Button>
+                  <Button
+                    onClick={() => actionApproval("4")}
+                    color="destructive"
+                    type="button"
+                  >
+                    <Icon icon="fa:times" className="mr-3" />
+                    {t("reject", { defaultValue: "Reject" })}
+                  </Button>
+                </div>
+              )
+            ) : (
+              ""
+            )} */}
           </div>
         </div>
       ) : (

components/form/content/video-detail-form.tsx

@@ -1866,13 +1866,36 @@ export default function FormVideoDetail() {
                 </DialogContent>
               </Dialog>
             </Card>
-            {Number(detail?.needApprovalFromLevel) == Number(userLevelId) ||
+            {Number(roleId) === 14 ? (
-            (detail?.needApprovalFromLevel && Number(userLevelNumber) == 1) ||
+              // 🔹 Jika roleId = 14 → tampilkan tombol langsung tanpa pengecekan lain
-            (detail?.isInternationalMedia == true &&
+              <div className="flex flex-col gap-2 p-3">
-              detail?.isForwardFromNational == true &&
+                <Button
-              Number(detail?.statusId) == 1) ? (
+                  onClick={() => actionApproval("2")}
-              Number(detail?.uploadedById) == Number(userId) &&
+                  color="primary"
-              Number(userLevelNumber) != 1 ? (
+                  type="button"
+                >
+                  <Icon icon="fa:check" className="mr-3" />{" "}
+                  {t("accept", { defaultValue: "Accept" })}
+                </Button>
+                <Button
+                  onClick={() => actionApproval("3")}
+                  className="bg-orange-400 hover:bg-orange-300"
+                  type="button"
+                >
+                  <Icon icon="fa:comment-o" className="mr-3" />{" "}
+                  {t("revision", { defaultValue: "Revision" })}
+                </Button>
+                <Button
+                  onClick={() => actionApproval("4")}
+                  color="destructive"
+                  type="button"
+                >
+                  <Icon icon="fa:times" className="mr-3" />
+                  {t("reject", { defaultValue: "Reject" })}
+                </Button>
+              </div>
+            ) : Number(detail?.needApprovalFromLevel) == Number(userLevelId) ? (
+              Number(detail?.uploadedById) == Number(userId) ? (
                 ""
               ) : (
                 <div className="flex flex-col gap-2 p-3">
@@ -1905,6 +1928,41 @@ export default function FormVideoDetail() {
             ) : (
               ""
             )}
+
+            {/* {Number(detail?.needApprovalFromLevel) == Number(userLevelId) ? (
+              Number(detail?.uploadedById) == Number(userId) ? (
+                ""
+              ) : (
+                <div className="flex flex-col gap-2 p-3">
+                  <Button
+                    onClick={() => actionApproval("2")}
+                    color="primary"
+                    type="button"
+                  >
+                    <Icon icon="fa:check" className="mr-3" />{" "}
+                    {t("accept", { defaultValue: "Accept" })}
+                  </Button>
+                  <Button
+                    onClick={() => actionApproval("3")}
+                    className="bg-orange-400 hover:bg-orange-300"
+                    type="button"
+                  >
+                    <Icon icon="fa:comment-o" className="mr-3" />{" "}
+                    {t("revision", { defaultValue: "Revision" })}
+                  </Button>
+                  <Button
+                    onClick={() => actionApproval("4")}
+                    color="destructive"
+                    type="button"
+                  >
+                    <Icon icon="fa:times" className="mr-3" />
+                    {t("reject", { defaultValue: "Reject" })}
+                  </Button>
+                </div>
+              )
+            ) : (
+              ""
+            )} */}
           </div>
         </div>
       ) : (

service/http-config/axiosNulisAIInstance.ts

@@ -1,6 +1,8 @@
 import axios from "axios";
 
-const baseURL = "https://staging.disestages.com/api";
+// const baseURL = "https://staging.disestages.com/api";
+
+const baseURL = "https://new.disestages.com/api";
 
 const axiosNulisAIInstance = axios.create({
   baseURL,