Fix merge conflicts

frontend/src/views/DashboardPage/components/SecretInputRow/SecretInputRow.tsx

@@ -270,7 +270,7 @@ export const SecretInputRow = memo(
           className="flex w-full flex-grow flex-row border-r border-none border-red"
           style={{ padding: "0.5rem 0 0.5rem 1rem" }}
         >
-          <div className="w-full">
+          <div className="w-full flex items-center">
             {isOverridden ? (
               <Controller
                 control={control}

frontend/src/views/IntegrationsPage/IntegrationPage.utils.tsx

@@ -87,6 +87,9 @@ export const redirectForProviderAuth = (integrationOption: TCloudIntegration) =>
       case "checkly":
         link = `${window.location.origin}/integrations/checkly/authorize`;
         break;
+      case "qovery":
+        link = `${window.location.origin}/integrations/qovery/authorize`;
+        break;
       case "railway":
         link = `${window.location.origin}/integrations/railway/authorize`;
         break;

frontend/src/views/IntegrationsPage/components/IntegrationsSection/IntegrationsSection.tsx

@@ -96,8 +96,30 @@ export const IntegrationsSection = ({
                     {integrationSlugNameMapping[integration.integration]}
                   </div>
                 </div>
+                {(integration.integration === "qovery") && (
+                  <div className="flex flex-row">
+                    <div className="ml-2 flex flex-col">
+                      <FormLabel label="Org" />
+                      <div className="rounded-md border border-mineshaft-700 bg-mineshaft-900 px-3 py-2 font-inter text-sm text-bunker-200">
+                        {integration?.owner || "-"}
+                      </div>
+                    </div>
+                    <div className="ml-2 flex flex-col">
+                      <FormLabel label="Project" />
+                      <div className="rounded-md border border-mineshaft-700 bg-mineshaft-900 px-3 py-2 font-inter text-sm text-bunker-200">
+                        {integration?.targetService || "-"}
+                      </div>
+                    </div>
+                    <div className="ml-2 flex flex-col">
+                      <FormLabel label="Env" />
+                      <div className="rounded-md border border-mineshaft-700 bg-mineshaft-900 px-3 py-2 font-inter text-sm text-bunker-200">
+                        {integration?.targetEnvironment || "-"}
+                      </div>
+                    </div>
+                  </div>
+                )}
                 <div className="ml-2 flex flex-col">
-                  <FormLabel label="App" />
+                  <FormLabel label={integration?.metadata?.scope || "App"} />
                   <div className="min-w-[8rem] rounded-md border border-mineshaft-700 bg-mineshaft-900 px-3 py-2 font-inter text-sm text-bunker-200">
                     {integration.integration === "hashicorp-vault"
                       ? `${integration.app} - path: ${integration.path}`
@@ -131,7 +153,7 @@ export const IntegrationsSection = ({
                   I={ProjectPermissionActions.Delete}
                   a={ProjectPermissionSub.Integrations}
                 >
-                  {(isAllowed) => (
+                  {(isAllowed: boolean) => (
                     <div className="ml-2 opacity-80 duration-200 hover:opacity-100">
                       <Tooltip content="Remove Integration">
                         <IconButton

frontend/src/views/Project/MembersPage/components/ProjectRoleListTab/components/ProjectRoleModifySection/ProjectRoleModifySection.tsx

@@ -3,6 +3,7 @@ import { faElementor } from "@fortawesome/free-brands-svg-icons";
 import {
   faAnchorLock,
   faArrowLeft,
+  faBook,
   faCog,
   faKey,
   faLock,
@@ -82,6 +83,12 @@ const SINGLE_PERMISSION_LIST = [
     icon: faTags,
     formName: "tags"
   },
+  {
+    title: "Audit Logs",
+    subtitle: "Audit log management control",
+    icon: faBook,
+    formName: "audit-logs"
+  },
   {
     title: "IP Allowlist",
     subtitle: "IP allowlist management control",