{/* Theme toggle button */}
diff --git a/src/renderer/components/layout/IndeterminateProgressOverlay.tsx b/src/renderer/components/layout/IndeterminateProgressOverlay.tsx
index c3106640..f59136f7 100644
--- a/src/renderer/components/layout/IndeterminateProgressOverlay.tsx
+++ b/src/renderer/components/layout/IndeterminateProgressOverlay.tsx
@@ -1,4 +1,4 @@
-import { Spinner } from 'flowbite-react';
+import { Spinner } from '@/components';
const IndeterminateProgressOverlay = ({ style = {} }) => (
diff --git a/src/renderer/components/proxy/Button.tsx b/src/renderer/components/proxy/Button.tsx
index 495074de..5e3e4d28 100644
--- a/src/renderer/components/proxy/Button.tsx
+++ b/src/renderer/components/proxy/Button.tsx
@@ -1,6 +1,6 @@
-import { Button as FlowbiteButton } from 'flowbite-react';
+import {Button as FlowbiteButton, ButtonProps} from 'flowbite-react';
-function Button({ children, ...props }) {
+function Button({ children, ...props }: ButtonProps) {
return (
{children}
);
diff --git a/src/renderer/components/proxy/Pagination.tsx b/src/renderer/components/proxy/Pagination.tsx
index 027dc8fb..b09eb9c7 100644
--- a/src/renderer/components/proxy/Pagination.tsx
+++ b/src/renderer/components/proxy/Pagination.tsx
@@ -1,6 +1,6 @@
-import {Pagination as FlowbitePagination} from 'flowbite-react';
+import {Pagination as FlowbitePagination, PaginationProps} from 'flowbite-react';
-function Pagination(props: any) {
+function Pagination(props: PaginationProps) {
return (
);
diff --git a/src/renderer/components/proxy/Sidebar.tsx b/src/renderer/components/proxy/Sidebar.tsx
new file mode 100644
index 00000000..eb273e6a
--- /dev/null
+++ b/src/renderer/components/proxy/Sidebar.tsx
@@ -0,0 +1,37 @@
+import {
+ Sidebar as FlowbiteSidebar,
+ SidebarProps,
+ SidebarItemProps,
+ SidebarItemsProps,
+ SidebarItemGroupProps
+} from 'flowbite-react';
+
+function Sidebar({ children, ...props }: SidebarProps) {
+ return (
+
{children}
+ );
+}
+
+function Items({children, ...props}: SidebarItemsProps) {
+ return (
+
{children}
+ );
+}
+
+function ItemGroup({children, ...props}: SidebarItemGroupProps) {
+ return (
+
{children}
+ );
+}
+
+function Item({children, ...props}: SidebarItemProps) {
+ return (
+
{children}
+ );
+}
+
+Sidebar.Item = Item;
+Sidebar.Items = Items;
+Sidebar.ItemGroup = ItemGroup;
+
+export { Sidebar };
\ No newline at end of file
diff --git a/src/renderer/components/proxy/Spinner.tsx b/src/renderer/components/proxy/Spinner.tsx
new file mode 100644
index 00000000..3bea6ad0
--- /dev/null
+++ b/src/renderer/components/proxy/Spinner.tsx
@@ -0,0 +1,9 @@
+import {Spinner as FlowbiteSpinner, SpinnerProps} from 'flowbite-react';
+
+function Spinner({ children, ...props }: SpinnerProps) {
+ return (
+
{children}
+ );
+}
+
+export {Spinner};
\ No newline at end of file
diff --git a/src/renderer/components/proxy/TextInput.tsx b/src/renderer/components/proxy/TextInput.tsx
index cba70574..5cb36b0e 100644
--- a/src/renderer/components/proxy/TextInput.tsx
+++ b/src/renderer/components/proxy/TextInput.tsx
@@ -1,6 +1,6 @@
-import { TextInput as FlowbiteTextInput } from 'flowbite-react';
+import {TextInput as FlowbiteTextInput, TextInputProps} from 'flowbite-react';
-function TextInput({ ...props }) {
+function TextInput({ ...props }: TextInputProps) {
return (
);
diff --git a/src/renderer/components/proxy/Tooltip.tsx b/src/renderer/components/proxy/Tooltip.tsx
new file mode 100644
index 00000000..89ecbca0
--- /dev/null
+++ b/src/renderer/components/proxy/Tooltip.tsx
@@ -0,0 +1,9 @@
+import {Tooltip as FlowbiteTooltip, TooltipProps} from 'flowbite-react';
+
+function Tooltip({ children, ...props }: TooltipProps) {
+ return (
+
{children}
+ );
+}
+
+export {Tooltip};
\ No newline at end of file
diff --git a/src/renderer/components/proxy/index.ts b/src/renderer/components/proxy/index.ts
index 86297adf..d4154123 100644
--- a/src/renderer/components/proxy/index.ts
+++ b/src/renderer/components/proxy/index.ts
@@ -1,4 +1,7 @@
export * from './Button';
export * from './Pagination';
export * from './Dropdown';
-export * from './TextInput';
\ No newline at end of file
+export * from './TextInput';
+export * from './Spinner';
+export * from './Sidebar';
+export * from './Tooltip';
\ No newline at end of file
diff --git a/src/renderer/pages/ProjectsList/ProjectsList.tsx b/src/renderer/pages/ProjectsList/ProjectsList.tsx
index 3a7e12dc..2728eaaa 100644
--- a/src/renderer/pages/ProjectsList/ProjectsList.tsx
+++ b/src/renderer/pages/ProjectsList/ProjectsList.tsx
@@ -9,6 +9,7 @@ import {
ProjectsListTable,
SearchBox,
} from '@/components';
+import {FormattedMessage} from "react-intl";
const ProjectsList: React.FC = () => {
const [currentPage, setCurrentPage] = useQueryParamState('page', '1');
@@ -46,11 +47,11 @@ const ProjectsList: React.FC = () => {
}
if (projectsError) {
- return
cant load;
+ return
;
}
if (!projectsData){
- return No Projects Found;
+ return ;
}
return (
diff --git a/src/renderer/pages/UnitsList/UnitsList.tsx b/src/renderer/pages/UnitsList/UnitsList.tsx
new file mode 100644
index 00000000..f9de327e
--- /dev/null
+++ b/src/renderer/pages/UnitsList/UnitsList.tsx
@@ -0,0 +1,81 @@
+import React, { useCallback } from 'react';
+import { useGetUnitsQuery } from '@/api';
+import { useQueryParamState } from '@/hooks';
+import { debounce } from 'lodash';
+import {
+ OrganizationSelector,
+ IndeterminateProgressOverlay,
+ SkeletonTable,
+ SearchBox,
+ UnitsListTable,
+} from '@/components';
+import {FormattedMessage} from "react-intl";
+
+const UnitsList: React.FC = () => {
+ const [currentPage, setCurrentPage] = useQueryParamState('page', '1');
+ const [orgUid, setOrgUid] = useQueryParamState('orgUid', undefined);
+ const [search, setSearch] = useQueryParamState('search', undefined);
+
+ const {
+ data: unitsData,
+ isLoading: unitsLoading,
+ isFetching: unitsFetching,
+ error: unitsError,
+ } = useGetUnitsQuery({ page: Number(currentPage), orgUid, search });
+
+ const handlePageChange = useCallback(
+ debounce((page) => setCurrentPage(page), 800),
+ [setCurrentPage],
+ );
+
+ const handleOrganizationSelected = useCallback(
+ (organization: any) => {
+ setOrgUid(organization?.orgUid);
+ },
+ [setOrgUid],
+ );
+
+ const handleSearchChange = useCallback(
+ debounce((event: any) => {
+ setSearch(event.target.value);
+ }, 800),
+ [setSearch, debounce],
+ );
+
+ if (unitsLoading) {
+ return ;
+ }
+
+ if (unitsError) {
+ return ;
+ }
+
+ if (!unitsData){
+ return ;
+ }
+
+ return (
+ <>
+ {unitsFetching && }
+
+
+
+
+
+ {unitsLoading ? (
+
+ ) : (
+
+ )}
+
+ );
+};
+
+export { UnitsList };
diff --git a/src/renderer/pages/UnitsList/index.ts b/src/renderer/pages/UnitsList/index.ts
new file mode 100644
index 00000000..ca0a28cb
--- /dev/null
+++ b/src/renderer/pages/UnitsList/index.ts
@@ -0,0 +1 @@
+export * from './UnitsList';
\ No newline at end of file
diff --git a/src/renderer/pages/index.ts b/src/renderer/pages/index.ts
index 2364c583..64381782 100644
--- a/src/renderer/pages/index.ts
+++ b/src/renderer/pages/index.ts
@@ -1,2 +1,3 @@
export * from './Error';
export * from './ProjectsList';
+export * from './UnitsList';
diff --git a/src/renderer/routes/AppNavigator.tsx b/src/renderer/routes/AppNavigator.tsx
index 28e4b362..26e2e8ba 100644
--- a/src/renderer/routes/AppNavigator.tsx
+++ b/src/renderer/routes/AppNavigator.tsx
@@ -28,6 +28,10 @@ const AppNavigator: React.FC = () => {
path={ROUTES.PROJECTS_LIST}
element={}
/>
+ }
+ />
}
diff --git a/src/renderer/routes/route-constants.ts b/src/renderer/routes/route-constants.ts
index d1d83335..e3f3bb66 100644
--- a/src/renderer/routes/route-constants.ts
+++ b/src/renderer/routes/route-constants.ts
@@ -1,3 +1,4 @@
export default {
PROJECTS_LIST: '/ProjectsList',
+ UNITS_LIST: '/UnitsList'
};
\ No newline at end of file
diff --git a/src/renderer/translations/tokens/en-US.json b/src/renderer/translations/tokens/en-US.json
index 5106477b..d0f0bde2 100644
--- a/src/renderer/translations/tokens/en-US.json
+++ b/src/renderer/translations/tokens/en-US.json
@@ -3,5 +3,30 @@
"please-reload-or-restart-the-application": "Please reload or restart the application",
"projects-list": "Projects List",
"no-records-found": "No records found",
- "unable-to-load-click-to-retry": "Unable to load, click to retry"
+ "unable-to-load-click-to-retry": "Unable to load, click to retry",
+ "unit-owner": "Unit Owner",
+ "country-jurisdiction-of-owner": "Country Jurisdiction of Owner",
+ "serial-number-block": "Serial Number Block",
+ "unit-count": "Unit Count",
+ "marketplace": "Marketplace",
+ "unit-tags": "Unit Tags",
+ "unit-status": "Unit Status",
+ "corresponding-adjustment-declaration": "Corresponding Adjustment Declaration",
+ "corresponding-adjustment-status": "Corresponding Adjustment Status",
+ "units-list": "Units List",
+ "vintage-year": "Vintage Year",
+ "unit-type": "Unit Type",
+ "unable-to-load-contents": "Unable to Load Contents",
+ "search": "Search",
+ "current-registry": "Current Registry",
+ "project-id": "Project Id",
+ "project-name": "Project Name",
+ "project-developer": "Project Developer",
+ "sector": "Sector",
+ "project-type": "Project Type",
+ "project-tags": "Project Tags",
+ "covered-by-ndc": "Covered By Ndc",
+ "project-status": "Project Status",
+ "unit-metric": "Unit Metric",
+ "validation-body": "Validation Body"
}
\ No newline at end of file