Merge pull request #27 from knovator/updates_fixes

Updates & Fixes
knovator · Aug 29, 2022 · f2795dd · f2795dd
2 parents 727de31 + d292198
commit f2795dd
Show file tree

Hide file tree

Showing 11 changed files with 69 additions and 45 deletions.
diff --git a/example/index.tsx b/example/index.tsx
@@ -10,32 +10,16 @@ const App = () => {
                 baseUrl="http://localhost:8080"
                 token="ABCD" // token={getToken()}
             >
-                {/* <h2>Master</h2>
-                <Master
-                    explicitForm
-                    permissions={{ add: false, list: true, update: true, destroy: true }}
-                    limits={[1, 2, 3]}
-                >
-                    <Master.Search />
-                    <Master.AddButton />
-                    <Master.Table />
-                    <Master.Pagination />
-
-                </Master> */}
-                    {/* <Master.FormWrapper>
-						{(data) => (
-							data.open ? <p onClick={data.onClose}>Drawer</p> : null
-						)}
-					</Master.FormWrapper> */}
-
-				<h2>Sub-Master</h2>
-				<Master>
-					<Master.Lister />
-					<SubMaster>
-						<SubMaster.Table />
+                <h2>Sub-Master</h2>
+                <Master>
+                    <Master.Lister />
+                    <SubMaster limits={[1, 2, 3, 4, 5]}>
+                        <SubMaster.Search />
+                        <SubMaster.AddButton />
+                        <SubMaster.Table />
                         <SubMaster.Pagination />
-					</SubMaster>
-				</Master>
+                    </SubMaster>
+                </Master>
             </Provider>
         </div>
     )

diff --git a/src/api/list.ts b/src/api/list.ts
@@ -21,7 +21,7 @@ const apiList = {
         method: "PUT",
     }),
     DELETE: ({ module }: API_INPUT_TYPE) => ({
-        url: `admin/${module}/soft-delete`,
+        url: `admin/${module}/delete`,
         method: "PUT",
     }),
     SEQUENCE: ({ module }: API_INPUT_TYPE) => ({

diff --git a/src/components/Common/DNDTable/DNDTable.tsx b/src/components/Common/DNDTable/DNDTable.tsx
@@ -13,6 +13,7 @@ const DNDTable = ({
     loading,
     onMove,
     dragEnable = false,
+    noDataText = "No data found",
 }: TableProps) => {
     const getSortConfigClassName = useCallback(
         (accessor: string, up = true) => {
@@ -128,7 +129,7 @@ const DNDTable = ({
                                             })
                                         ) : (
                                             <tr>
-                                                <td colSpan={columns?.length || 0}>No data found</td>
+                                                <td colSpan={columns?.length || 0}>{noDataText}</td>
                                             </tr>
                                         )}
                                     </tbody>

diff --git a/src/components/Common/Table/Table.tsx b/src/components/Common/Table/Table.tsx
@@ -2,7 +2,16 @@ import React, { useCallback } from "react"
 import { useTable } from "react-table"
 import { EXCLUDE_SORT_COLUMNS, SORT_ASCENDING, SORT_DESCENDING } from "../../../constants/common"
 
-const Table = ({ data, columns, sortConfig, sortable = true, setSortConfig, loader, loading }: TableProps) => {
+const Table = ({
+    data,
+    columns,
+    sortConfig,
+    sortable = true,
+    setSortConfig,
+    loader,
+    loading,
+    noDataText = "No data found",
+}: TableProps) => {
     const getSortConfigClassName = useCallback(
         (accessor: string, up = true) => {
             if (!sortConfig || accessor !== sortConfig[0]) return "kms_sort-inactive"
@@ -84,7 +93,7 @@ const Table = ({ data, columns, sortConfig, sortable = true, setSortConfig, load
                                 })
                             ) : (
                                 <tr>
-                                    <td colSpan={columns?.length || 0}>No data found</td>
+                                    <td colSpan={columns?.length || 0}>{noDataText}</td>
                                 </tr>
                             )}
                         </tbody>

diff --git a/src/components/Master/MasterTable/MasterTable.tsx b/src/components/Master/MasterTable/MasterTable.tsx
@@ -27,7 +27,7 @@ const MasterTable = ({ columns, actions }: TableWrapperProps) => {
         (item: any, key: string) => {
             return function (value: string) {
                 if (onUpdate && canPartialUpdate) {
-                    onUpdate(item.id, { [key]: value })
+                    onUpdate(item._id, { [key]: value })
                 }
             }
         },
@@ -109,6 +109,7 @@ const MasterTable = ({ columns, actions }: TableWrapperProps) => {
                 setSortConfig={setSortConfig}
                 loader={loader}
                 loading={loading}
+                noDataText={t("master:noDataText")}
             />
         )
     }

diff --git a/src/components/SubMaster/SubMasterSearch/SubMasterSearch.tsx b/src/components/SubMaster/SubMasterSearch/SubMasterSearch.tsx
@@ -1,12 +1,18 @@
-import React, { useRef, useState } from "react"
+import React, { useEffect, useRef, useState } from "react"
 import { Input } from "../../../components/Common"
+import { useProviderState } from "../../../context/ProviderContext"
 import { useSubMasterState } from "../../../context/SubMasterContext"
 
 const SubMasterSearch = () => {
+    const { selectedMaster } = useProviderState()
     const { getSubMastersList, t } = useSubMasterState()
     const callerRef = useRef<NodeJS.Timeout | null>(null)
     const [search, setSearch] = useState<string>("")
 
+    useEffect(() => {
+        setSearch("")
+    }, [selectedMaster])
+
     const onChangeSearch = (str: string) => {
         setSearch(str)
         if (callerRef.current) clearTimeout(callerRef.current)

diff --git a/src/components/SubMaster/SubMasterTable/SubMasterTable.tsx b/src/components/SubMaster/SubMasterTable/SubMasterTable.tsx
@@ -1,14 +1,17 @@
 import React, { useCallback, useEffect, useState } from "react"
-import { useSubMasterState } from "../../../context/SubMasterContext"
-import { DNDTable } from "../../../components/Common"
-import DeleteIcon from "../../../icons/deleteIcon"
-import UpdateIcon, { UpdateSVG } from "../../../icons/updateIcon"
-import { CheckSVG } from "../../../icons/checkIcon"
+import classNames from "classnames"
 import { XSVG } from "../../../icons/xIcon"
 import MoveIcon from "../../../icons/moveIcon"
-import classNames from "classnames"
+import DeleteIcon from "../../../icons/deleteIcon"
+import { CheckSVG } from "../../../icons/checkIcon"
+import { DNDTable } from "../../../components/Common"
+import UpdateIcon, { UpdateSVG } from "../../../icons/updateIcon"
+
+import { useProviderState } from "../../../context/ProviderContext"
+import { useSubMasterState } from "../../../context/SubMasterContext"
 
 const SubMasterTable = ({ columns, actions }: TableWrapperProps) => {
+    const { selectedMaster } = useProviderState()
     const {
         onUpdate,
         sortable,
@@ -35,7 +38,7 @@ const SubMasterTable = ({ columns, actions }: TableWrapperProps) => {
         (item: any, key: string) => {
             return function (value: string) {
                 if (onUpdate && canPartialUpdate) {
-                    onUpdate(item.id, { [key]: value })
+                    onUpdate(item._id, { [key]: value })
                 }
             }
         },
@@ -189,6 +192,7 @@ const SubMasterTable = ({ columns, actions }: TableWrapperProps) => {
                 loading={loading}
                 onMove={updateSequence}
                 dragEnable={sequencing}
+                noDataText={selectedMaster ? t("submaster:noDataText") : t("submaster:selectMaster")}
             />
         )
     }

diff --git a/src/constants/common.ts b/src/constants/common.ts
@@ -49,6 +49,8 @@ const TRANSLATION_PAIRS_SUBMASTERS = {
     searchSubMasters: "Search Sub Masters", // Search Placeholder
     addSubMaster: "Add Sub Master", // Add Button, Sidebar Title
     updateSubMaster: "Edit Sub Master", // Edit Button, Sidebar Title
+    "submaster:noDataText": "No data found! Click on 'Add Sub Master' to add one.", // No Data Text
+    "submaster:selectMaster": "select 'Master' to see respective 'SubMasters'", // Select Master Message
 }
 
 const TRANSLATION_PAIRS_MASTERS = {
@@ -66,6 +68,7 @@ const TRANSLATION_PAIRS_MASTERS = {
     description: "Discription", // Form,
     enterDiscription: "Enter Description", // Description Placeholder
     active: "Active",
+    "master:noDataText": "No data found! Click on 'Add Master' to add one.", // No Data Text
 }
 
 const TRANSLATION_PAIRS_COMMON = {

diff --git a/src/hook/useMaster.tsx b/src/hook/useMaster.tsx
@@ -98,7 +98,7 @@ const useMaster = ({ defaultLimit, routes, defaultSort = ["createdAt", 1], preCo
                 })
                 if (response?.code === "SUCCESS") {
                     onSuccess(CALLBACK_CODES.UPDATE, response.code, response.message)
-                    getMastersList()
+                    setList((oldList) => oldList.map((item) => (item._id === id ? { ...item, ...data } : item)))
                 } else {
                     onError(CALLBACK_CODES.UPDATE, response.code, response.message)
                 }
@@ -132,7 +132,9 @@ const useMaster = ({ defaultLimit, routes, defaultSort = ["createdAt", 1], preCo
                 getMastersList()
                 onCloseForm()
             }
-        } catch (error) {}
+        } catch (error) {
+            setLoading(false)
+        }
     }
     const onCloseForm = () => {
         setFormState(undefined)
@@ -163,7 +165,7 @@ const useMaster = ({ defaultLimit, routes, defaultSort = ["createdAt", 1], preCo
                     url: api.url,
                     onError: handleError(CALLBACK_CODES.DELETE),
                     data: {
-                        id: [itemData?.id],
+                        id: itemData?.id,
                     },
                 })
                 if (response?.code === "SUCCESS") {

diff --git a/src/hook/useSubMaster.tsx b/src/hook/useSubMaster.tsx
@@ -107,7 +107,7 @@ const useSubMaster = ({ defaultLimit, routes, defaultSort = ["seq", 1], preConfi
                 })
                 if (response?.code === "SUCCESS") {
                     onSuccess(CALLBACK_CODES.UPDATE, response.code, response.message)
-                    getSubMastersList()
+                    setList((oldList) => oldList.map((item) => (item._id === id ? { ...item, ...data } : item)))
                 } else {
                     onError(CALLBACK_CODES.UPDATE, response.code, response.message)
                 }
@@ -146,7 +146,9 @@ const useSubMaster = ({ defaultLimit, routes, defaultSort = ["seq", 1], preConfi
                 getSubMastersList()
                 onCloseForm()
             }
-        } catch (error) {}
+        } catch (error) {
+            setLoading(false)
+        }
     }
     const onCloseForm = () => {
         setFormState(undefined)
@@ -177,7 +179,7 @@ const useSubMaster = ({ defaultLimit, routes, defaultSort = ["seq", 1], preConfi
                     url: api.url,
                     onError: handleError(CALLBACK_CODES.DELETE),
                     data: {
-                        id: [itemData?.id],
+                        id: itemData?.id,
                     },
                 })
                 if (response?.code === "SUCCESS") {
@@ -308,7 +310,18 @@ const useSubMaster = ({ defaultLimit, routes, defaultSort = ["seq", 1], preConfi
             getSubMastersList()
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [pageSize, currentPage, selectedMaster])
+    }, [pageSize, currentPage])
+
+    useEffect(() => {
+        if (selectedMaster) {
+            if (currentPage === 1) {
+                setSequencing(false)
+                getSubMastersList()
+            } else {
+                setCurrentPage(1)
+            }
+        }
+    }, [selectedMaster])
 
     return {
         list,

diff --git a/types/global.d.ts b/types/global.d.ts
@@ -112,6 +112,7 @@ interface TableProps {
     setSortConfig?: (data: SortConfigType) => void
     onMove?: (sourceIndex: number, destinationIndex: number) => void
     dragEnable?: boolean
+    noDataText?: string
 }
 
 interface TableActionTypes {