From 441dd9e5fc44636e347d45ec42b8e894274f17bb Mon Sep 17 00:00:00 2001
From: Leon <>
Date: Sun, 23 Jan 2022 12:29:35 +0200
Subject: [PATCH 1/2] change

---
 ui/src/components/UI/Modals/ConfirmationModal.tsx | 6 ++----
 ui/src/components/UI/Modals/CustomModal.tsx       | 3 +--
 ui/src/helpers/commonStyle.ts                     | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/ui/src/components/UI/Modals/ConfirmationModal.tsx b/ui/src/components/UI/Modals/ConfirmationModal.tsx
index 0e6372a86..fe7b4bb9d 100644
--- a/ui/src/components/UI/Modals/ConfirmationModal.tsx
+++ b/ui/src/components/UI/Modals/ConfirmationModal.tsx
@@ -29,9 +29,9 @@ const ConfirmationModal: React.FC<ConfirmationModalProps> = observer(({title, is
                                                                         confirmButtonColor, titleColor, img, isLoading,children,
                                                                         className}) => {
     const classes = useCommonStyles();
-    const confirmStyle = {width: 100, marginLeft: 20}
+    const confirmStyle = {width: 100, marginLeft: 20}                                                                  
     return (
-        <CustomModal open={isOpen} onClose={onClose} disableBackdropClick={true} isWide={isWide} className={className}>
+        <CustomModal open={isOpen} onClose={onClose} disableBackdropClick={true} isWide={isWide} className={`${className}`}>
             <div className="confirmationHeader">
                 <div className="confirmationTitle" style={titleColor ? {color: titleColor} : {}}>{title ?? "CONFIRMATION"}</div>
                 <img src={iconClose} onClick={onClose} alt="close"/>
@@ -55,8 +55,6 @@ const ConfirmationModal: React.FC<ConfirmationModalProps> = observer(({title, is
                 </Button>
                 <Button style={confirmButtonColor ? {backgroundColor: confirmButtonColor,...confirmStyle} : {...confirmStyle}} 
                     className={classes.button} size={"small"}
-                    
-                    
                     onClick={onConfirm} 
                     disabled={confirmDisabled || isLoading} 
                     endIcon={isLoading && <img src={spinner} alt="spinner"/>}>{confirmButtonText ?? "YES"}
diff --git a/ui/src/components/UI/Modals/CustomModal.tsx b/ui/src/components/UI/Modals/CustomModal.tsx
index b9ca05827..f0fd0887b 100644
--- a/ui/src/components/UI/Modals/CustomModal.tsx
+++ b/ui/src/components/UI/Modals/CustomModal.tsx
@@ -10,8 +10,7 @@ const useStyles = makeStyles({
         justifyContent: "center"
     },
     modalContents: {
-        borderRadius: "5px",
-        
+        borderRadius: "5px",      
         outline: "none",
         minWidth: "300px",
         backgroundColor: "rgb(255, 255, 255)"
diff --git a/ui/src/helpers/commonStyle.ts b/ui/src/helpers/commonStyle.ts
index 6f4482bdd..7418520e4 100644
--- a/ui/src/helpers/commonStyle.ts
+++ b/ui/src/helpers/commonStyle.ts
@@ -41,7 +41,7 @@ export const useCommonStyles = makeStyles(() => ({
         top: '10%',
         left: '50%',
         transform: 'translate(-50%, 0%)',
-        width: '80vw',
+        width: "MAX(40vw, 600px)",
         bgcolor: 'background.paper',
         borderRadius: '5px',
         boxShadow: 24,

From fc5961ca428225cdd9925a9e682303d7cd449b6b Mon Sep 17 00:00:00 2001
From: Leon <>
Date: Mon, 24 Jan 2022 12:37:08 +0200
Subject: [PATCH 2/2] table added

---
 ui/src/components/UI/Table.tsx             | 74 +++++++++++++++++
 ui/src/components/UI/style/Table.sass      | 92 ++++++++++++++++++++++
 ui/src/components/assets/dotted-circle.svg |  3 +
 ui/src/variables.module.scss               |  2 +
 4 files changed, 171 insertions(+)
 create mode 100644 ui/src/components/UI/Table.tsx
 create mode 100644 ui/src/components/UI/style/Table.sass
 create mode 100644 ui/src/components/assets/dotted-circle.svg

diff --git a/ui/src/components/UI/Table.tsx b/ui/src/components/UI/Table.tsx
new file mode 100644
index 000000000..e8506c7f5
--- /dev/null
+++ b/ui/src/components/UI/Table.tsx
@@ -0,0 +1,74 @@
+import React, {useEffect, useState} from "react";
+import './style/Table.sass';
+import editImg from "../assets/edit.svg";
+import deleteImg from "../assets/delete.svg"
+import circleImg from "../assets/dotted-circle.svg"
+import Delete from '@material-ui/icons/Delete';
+import Edit from '@material-ui/icons/Edit';
+
+
+interface Props {
+    rows : any[];
+    cols : {field:string, cellClassName?: string,header:string, width?:number,
+            getCellClassName?:(field:string,value : any) => string}[];
+    onRowEdit : (any) => void;
+    onRowDelete : (any) => void;
+    noDataMeesage : string;
+}
+
+export const Table: React.FC<Props> = ({rows, cols, onRowDelete, onRowEdit,noDataMeesage}) => {
+
+    const [tableRows, updateTableRows] = useState(rows);
+
+    useEffect(() => {
+        updateTableRows(rows)
+    },[rows])
+
+    const _onRowEdit = (row) => {
+        onRowEdit(row)
+    }
+    
+    const _onRowDelete = (row) => {
+        onRowDelete(row);
+    }
+    return <table cellPadding={5} style={{borderCollapse: "collapse"}} className="mui-table">
+    <thead className="mui-table__thead">
+    <tr style={{borderBottomWidth: "2px"}} className="mui-table__tr">
+        {cols?.map((col)=> {
+            return <th className="mui-table__th">{col.header}</th>
+        })}
+        <th></th>
+    </tr>
+    </thead>
+    <tbody className="mui-table__tbody">
+        {
+            ((tableRows == null) || (tableRows.length === 0)) ?
+            <tr className="mui-table__no-data">
+            <img src={circleImg} alt="No data Found"></img>
+            <div className="mui-table__no-data-message">{noDataMeesage}</div>
+            </tr>
+
+            :
+        
+            tableRows?.map(rowData => {
+                return <tr key={rowData?.id} className="mui-table__tr">
+                    {cols.map(col => {                        
+                        return <td className={`${col.getCellClassName ? col.getCellClassName(col.field, rowData[col.field]) : ""}
+                                ${col?.cellClassName ?? ""} mui-table__td`}>
+                                    {rowData[col.field]}
+                            </td>
+                    })}
+                    <td className="mui-table__td mui-table__row-actions">        
+                        <span onClick={() => _onRowEdit(rowData)}>
+                            <Edit className="mui-table__row-actions--edit"></Edit>
+                        </span>
+                        <span  onClick={() => _onRowDelete(rowData)}>
+                            <Delete className="mui-table__row-actions--delete"></Delete>
+                        </span>
+                    </td>
+                </tr>
+            })
+        }
+    </tbody>
+</table>
+}
\ No newline at end of file
diff --git a/ui/src/components/UI/style/Table.sass b/ui/src/components/UI/style/Table.sass
new file mode 100644
index 000000000..bcd4223f7
--- /dev/null
+++ b/ui/src/components/UI/style/Table.sass
@@ -0,0 +1,92 @@
+@import '../../../variables.module'
+
+.mui-table
+    width: 100%
+    margin-top: 20px
+
+    &__tbody
+      max-height: calc(70vh - 355px)
+      overflow-y: auto
+      display: block
+
+    &__th
+      color: $blue-gray
+      text-align: left
+      padding: 10px
+
+    &__tr
+      border-bottom-width: 1px
+      border-bottom-color: $data-background-color
+      border-bottom-style: solid
+      display: table
+      table-layout: fixed
+      width: 100%
+
+    &__no-data
+        display: flex;
+        justify-content: space-between;
+        flex-direction: column;
+        height: 95px;
+        overflow-y: auto;
+        margin: 2%;
+        align-items: center;
+        align-content: center;
+        padding-top: 3%;
+        padding-bottom: 3%;
+
+        &-message
+            font-style: normal;
+            font-weight: 600;
+            font-size: 12px;
+            line-height: 15px;
+            color: $light-gray;
+
+    &__tr:hover
+        background: #F7F9FC
+
+        & .mui-table__row-actions
+            &--delete
+                cursor: pointer;
+                path
+                    fill:#DB2156 
+            &--edit 
+                cursor: pointer;
+                path
+                    fill: $blue-color
+
+    &__row-actions
+        display: flex
+        justify-content: flex-end
+                 
+
+    &__td
+      color: $light-gray
+      padding: 10px
+      font-size: 16px
+
+@mixin row-actions
+        display: flex
+        justify-content: flex-end
+
+
+@mixin status-base($bg_color, $color, $border)
+    box-sizing: border-box
+    border-radius: 4px
+    height : 20px
+    width : 63px
+    display: flex
+    align-content: center
+    justify-content: center
+    align-items: center
+    background: $bg_color
+    color: $color
+    border: $border
+
+.status
+    &--active
+        @include status-base(rgba(111, 207, 151, 0.5), #247E4B, 1px solid #219653)
+
+    &--pending
+        @include status-base(rgba(242, 201, 76, 0.5), #8C7325, 1px solid #F2994A)
+
+    
\ No newline at end of file
diff --git a/ui/src/components/assets/dotted-circle.svg b/ui/src/components/assets/dotted-circle.svg
new file mode 100644
index 000000000..2017acec3
--- /dev/null
+++ b/ui/src/components/assets/dotted-circle.svg
@@ -0,0 +1,3 @@
+<svg width="55" height="55" viewBox="0 0 55 55" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="27.5" cy="27.5" r="27" stroke="#BCCEFD" stroke-dasharray="6 6"/>
+</svg>
diff --git a/ui/src/variables.module.scss b/ui/src/variables.module.scss
index 8c9623ddb..1d97738cc 100644
--- a/ui/src/variables.module.scss
+++ b/ui/src/variables.module.scss
@@ -7,6 +7,8 @@ $blue-color: #205CF5;
 $light-blue-color: #BCCEFD;
 $success-color: #27AE60;
 $failure-color: #EB5757;
+
+
 $blue-gray: #494677;
 $light-gray: #8F9BB2;