|
diff --git a/web/src/helpers/api.ts b/web/src/helpers/api.ts
index d3bc20ec..5a005759 100644
--- a/web/src/helpers/api.ts
+++ b/web/src/helpers/api.ts
@@ -1,4 +1,5 @@
import axios from "axios";
+import { Resource } from "@/types/proto/api/v2/resource_service_pb";
import { GetUserResponse } from "@/types/proto/api/v2/user_service_pb";
export function getSystemStatus() {
@@ -143,17 +144,6 @@ export function getResourceList() {
return axios.get("/api/v1/resource");
}
-export function getResourceListWithLimit(resourceFind?: ResourceFind) {
- const queryList = [];
- if (resourceFind?.offset) {
- queryList.push(`offset=${resourceFind.offset}`);
- }
- if (resourceFind?.limit) {
- queryList.push(`limit=${resourceFind.limit}`);
- }
- return axios.get(`/api/v1/resource?${queryList.join("&")}`);
-}
-
export function createResource(resourceCreate: ResourceCreate) {
return axios.post("/api/v1/resource", resourceCreate);
}
diff --git a/web/src/helpers/datetime.ts b/web/src/helpers/datetime.ts
index 72683b08..c801d58e 100644
--- a/web/src/helpers/datetime.ts
+++ b/web/src/helpers/datetime.ts
@@ -57,7 +57,7 @@ export function getTimeString(t?: Date | number | string): string {
* - "pt-BR" locale: "30/01/2023 22:05:00"
* - "pl" locale: "30.01.2023, 22:05:00"
*/
-export function getDateTimeString(t?: Date | number | string, locale = i18n.language): string {
+export function getDateTimeString(t?: Date | number | string | any, locale = i18n.language): string {
const tsFromDate = getTimeStampByDate(t ? t : Date.now());
return new Date(tsFromDate).toLocaleDateString(locale, {
diff --git a/web/src/pages/Resources.tsx b/web/src/pages/Resources.tsx
index 75de982f..1ce1e33f 100644
--- a/web/src/pages/Resources.tsx
+++ b/web/src/pages/Resources.tsx
@@ -1,29 +1,45 @@
-import { useEffect } from "react";
-import { toast } from "react-hot-toast";
+import axios from "axios";
+import { useEffect, useState } from "react";
+import { Link } from "react-router-dom";
import Empty from "@/components/Empty";
import Icon from "@/components/Icon";
import MobileHeader from "@/components/MobileHeader";
-import ResourceCard from "@/components/ResourceCard";
+import ResourceIcon from "@/components/ResourceIcon";
import useLoading from "@/hooks/useLoading";
-import { useResourceStore } from "@/store/module";
+import { ListResourcesResponse, Resource } from "@/types/proto/api/v2/resource_service_pb";
import { useTranslate } from "@/utils/i18n";
+const fetchAllResources = async () => {
+ const { data } = await axios.get("/api/v2/resources");
+ return data.resources;
+};
+
+function groupResourcesByDate(resources: Resource[]) {
+ const grouped = new Map();
+ resources.forEach((item) => {
+ const date = new Date(item.createdTs as any);
+ const year = date.getFullYear();
+ const month = date.getMonth() + 1;
+ const timestamp = Date.UTC(year, month - 1, 1);
+ if (!grouped.has(timestamp)) {
+ grouped.set(timestamp, []);
+ }
+ grouped.get(timestamp)?.push(item);
+ });
+ return grouped;
+}
+
const Resources = () => {
const t = useTranslate();
const loadingState = useLoading();
- const resourceStore = useResourceStore();
- const resources = resourceStore.state.resources;
+ const [resources, setResources] = useState([]);
+ const groupedResources = groupResourcesByDate(resources);
useEffect(() => {
- resourceStore
- .fetchResourceList()
- .then(() => {
- loadingState.setFinish();
- })
- .catch((error) => {
- console.error(error);
- toast.error(error.response.data.message);
- });
+ fetchAllResources().then((resources) => {
+ setResources(resources);
+ loadingState.setFinish();
+ });
}, []);
return (
@@ -41,22 +57,51 @@ const Resources = () => {
{t("resource.fetching-data")}
) : (
-
+ <>
{resources.length === 0 ? (
) : (
- resources.map((resource) => )
+
+ {Array.from(groupedResources.entries()).map(([timestamp, resources]) => {
+ const date = new Date(timestamp);
+ return (
+
+
+ {date.getFullYear()}
+ {date.toLocaleString("default", { month: "short" })}
+
+
+ {resources.map((resource) => {
+ return (
+
+
+
+
+
+
+ {new Date(resource.createdTs as any).toLocaleDateString()}
+
+
+ #{resource.relatedMemoId}
+
+
+
+ );
+ })}
+
+
+ );
+ })}
+
)}
- |