Entities Management API Implementation

frontend/src/App.js

@@ -38,6 +38,8 @@ import {
   AddAdministration,
   AddAttribute,
   AddEntity,
+  EntityData,
+  AddEntityData,
   // Visualisation,
 } from "./pages";
 import { useCookies } from "react-cookie";
@@ -199,13 +201,29 @@ const RouteList = () => {
         element={<Private element={AddAttribute} alias="master-data" />}
       />
       <Route
-        path="/master-data/entities"
+        path="/master-data/entity-types"
         element={<Private element={MasterDataEntities} alias="master-data" />}
       />
       <Route
-        path="/master-data/entities/add"
+        path="/master-data/entity-types/add"
         element={<Private element={AddEntity} alias="master-data" />}
       />
+      <Route
+        path="/master-data/entity-types/:id/edit"
+        element={<Private element={AddEntity} alias="master-data" />}
+      />
+      <Route
+        path="/master-data/entities"
+        element={<Private element={EntityData} alias="master-data" />}
+      />
+      <Route
+        path="/master-data/entities/add"
+        element={<Private element={AddEntityData} alias="master-data" />}
+      />
+      <Route
+        path="/master-data/entities/:id/edit"
+        element={<Private element={AddEntityData} alias="master-data" />}
+      />
       <Route path="/news-events" element={<NewsEvents />} />
       <Route path="/how-we-work" element={<HowWeWork />} />
       <Route path="/terms" element={<Terms />} />

frontend/src/components/filters/EntityDataFilters.js

@@ -0,0 +1,56 @@
+import React, { useMemo } from "react";
+import { Link } from "react-router-dom";
+import { Button, Col, Input, Row, Space } from "antd";
+import RemoveFiltersButton from "./RemoveFiltersButton";
+import AdministrationDropdown from "./AdministrationDropdown";
+import { store, uiText } from "../../lib";
+
+const { Search } = Input;
+
+const EntityDataFilters = ({ loading }) => {
+  const authUser = store.useState((s) => s.user);
+  const language = store.useState((s) => s.language);
+  const { active: activeLang } = language;
+  const text = useMemo(() => {
+    return uiText[activeLang];
+  }, [activeLang]);
+
+  return (
+    <Row>
+      <Col flex={1}>
+        <Space>
+          <Search
+            placeholder={text.searchEntity}
+            // value={query}
+            // onChange={(e) => {
+            //   setQuery(e.target.value);
+            // }}
+            // onSearch={(e) => {
+            //   fetchData(e);
+            // }}
+            style={{ width: 240 }}
+            // loading={loading && !!query}
+            allowClear
+          />
+          <AdministrationDropdown loading={loading} />
+          <RemoveFiltersButton
+            extra={(s) => {
+              s.filters = { trained: null, role: null, organisation: null };
+            }}
+          />
+        </Space>
+      </Col>
+      {["Super Admin"].includes(authUser?.role?.value) && (
+        <Col>
+          <Space>
+            <Button type="primary">{text.exportButton}</Button>
+            <Link to="/master-data/entities/add">
+              <Button type="primary">{text.addEntityData}</Button>
+            </Link>
+          </Space>
+        </Col>
+      )}
+    </Row>
+  );
+};
+export default EntityDataFilters;

frontend/src/components/filters/EntityFilters.js

@@ -1,25 +1,24 @@
-import { Button, Col, Input, Row, Space } from "antd";
-import RemoveFiltersButton from "./RemoveFiltersButton";
-import AdministrationDropdown from "./AdministrationDropdown";
-import { store } from "../../lib";
+import React, { useMemo } from "react";
 import { Link } from "react-router-dom";
-import {
-  PlusOutlined,
-  DownloadOutlined,
-  UploadOutlined,
-} from "@ant-design/icons";
+import { Button, Col, Input, Row, Space } from "antd";
+import { store, uiText } from "../../lib";
 
 const { Search } = Input;
 
-const EntityFilters = ({ loading }) => {
+const EntityFilters = () => {
   const authUser = store.useState((s) => s.user);
+  const language = store.useState((s) => s.language);
+  const { active: activeLang } = language;
+  const text = useMemo(() => {
+    return uiText[activeLang];
+  }, [activeLang]);
 
   return (
     <Row>
       <Col flex={1}>
         <Space>
           <Search
-            placeholder="Enter name..."
+            placeholder={text.searchEntityType}
             // value={query}
             // onChange={(e) => {
             //   setQuery(e.target.value);
@@ -31,29 +30,13 @@ const EntityFilters = ({ loading }) => {
             // loading={loading && !!query}
             allowClear
           />
-          <AdministrationDropdown loading={loading} />
-          <RemoveFiltersButton
-            extra={(s) => {
-              s.filters = { trained: null, role: null, organisation: null };
-            }}
-          />
         </Space>
       </Col>
       {["Super Admin"].includes(authUser?.role?.value) && (
         <Col>
           <Space>
-            <Link to="/data/upload">
-              <Button icon={<UploadOutlined />} shape="round">
-                Bulk Upload
-              </Button>
-            </Link>
-            <Button icon={<DownloadOutlined />} shape="round">
-              Export
-            </Button>
-            <Link to="/master-data/entities/add">
-              <Button type="primary" icon={<PlusOutlined />} shape="round">
-                Add New
-              </Button>
+            <Link to="/master-data/entity-types/add">
+              <Button type="primary">{text.addEntity}</Button>
             </Link>
           </Space>
         </Col>

frontend/src/components/index.js

@@ -27,6 +27,6 @@ export { default as DataTab } from "./tabs/DataTab";
 export { default as ContactForm } from "./contact-form/ContactForm";
 export { default as ManageDataTab } from "./tabs/MasterDataTab";
 export { default as AdministrationFilters } from "./filters/AdministrationFilters";
-export { default as DetailTable } from "./DetailTable";
 export { default as InputAttributes } from "./InputAttributes";
 export { default as EntityFilters } from "./filters/EntityFilters";
+export { default as EntityDataFilters } from "./filters/EntityDataFilters";

frontend/src/components/tabs/MasterDataTab.js

@@ -21,7 +21,10 @@ const MasterDataTab = ({ tabBarExtraContent }) => {
       <TabPane tab="Attributes" key="/master-data/attributes">
         &nbsp;
       </TabPane>
-      <TabPane tab="Entities" key="/master-data/entities">
+      <TabPane tab="Entities" key="/master-data/entities/">
+        &nbsp;
+      </TabPane>
+      <TabPane tab="Entity Types" key="/master-data/entity-types/">
         &nbsp;
       </TabPane>
       <TabPane tab="Organisations" key="/master-data/organisations">