fix(exm): bug

erxes · Nov 20, 2023 · 1ef2069 · 1ef2069
1 parent 3a2aed8
commit 1ef2069
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 6 deletions.
diff --git a/exm-web/app/(main)/page.tsx b/exm-web/app/(main)/page.tsx
@@ -9,7 +9,7 @@ const RightSideBar = dynamic(
 export default function IndexPage() {
   return (
     <>
-      <div className="flex h-full w-full flex-col">
+      <div className="flex h-full w-[62%] flex-col">
         <Feed />
       </div>
       <div className="flex w-1/3 flex-col">

diff --git a/exm-web/app/layout.tsx b/exm-web/app/layout.tsx
@@ -12,8 +12,8 @@ import { cn } from "@/lib/utils"
 import { Toaster } from "@/components/ui/toaster"
 
 export const metadata: Metadata = {
-  title: "exm",
-  description: "exm",
+  title: "Employee Experience Management",
+  description: "Employee Experience Management",
   icons: {
     icon: "/favicon.png",
     shortcut: "/favicon.png",

diff --git a/exm-web/modules/feed/component/List.tsx b/exm-web/modules/feed/component/List.tsx
@@ -55,7 +55,7 @@ const List = ({ contentType }: { contentType: string }) => {
   }
 
   return (
-    <ScrollArea className="h-[calc(100vh-65px)] px-[25px]">
+    <div className="h-[calc(100vh-65px)] px-[25px] overflow-auto">
       <FeedForm contentType={contentType} />
       {showList(pinnedList)}
       {showList(normalList)}
@@ -71,7 +71,7 @@ const List = ({ contentType }: { contentType: string }) => {
           <LoadingCard />
         </div>
       )}
-    </ScrollArea>
+    </div>
   )
 }
 

diff --git a/packages/plugin-exm-ui/src/containers/EditForm.tsx b/packages/plugin-exm-ui/src/containers/EditForm.tsx
@@ -7,6 +7,8 @@ import { Alert } from '@erxes/ui/src/utils';
 import EditForm from '../components/EditForm';
 import { mutations } from '../graphql';
 import { IExm } from '../types';
+import { IButtonMutateProps } from '@erxes/ui/src/types';
+import ButtonMutate from '@erxes/ui/src/components/ButtonMutate';
 
 type Props = {
   exm: IExm;
@@ -25,7 +27,29 @@ function EditFormContainer(props: Props) {
       });
   };
 
-  return <EditForm edit={edit} exm={props.exm} />;
+  const renderButton = ({
+    values,
+    isSubmitted,
+    callback,
+    object
+  }: IButtonMutateProps) => {
+    return (
+      <ButtonMutate
+        mutation={mutations.exmsEdit}
+        variables={values}
+        callback={callback}
+        refetchQueries={'exmGet'}
+        isSubmitted={isSubmitted}
+        type="submit"
+        icon="check-circle"
+        successMessage={`You successfully ${
+          object ? 'updated' : 'added'
+        } a exm`}
+      />
+    );
+  };
+
+  return <EditForm edit={edit} exm={props.exm} renderButton={renderButton} />;
 }
 
 export default EditFormContainer;