diff --git a/web/src/store/reducer/resource.ts b/web/src/store/reducer/resource.ts
index b1709952..102b2b31 100644
--- a/web/src/store/reducer/resource.ts
+++ b/web/src/store/reducer/resource.ts
@@ -21,14 +21,14 @@ const resourceSlice = createSlice({
upsertResources: (state, action: PayloadAction
) => {
return {
...state,
- resources: uniqBy([...action.payload, ...state.resources], "id"),
+ resources: uniqBy([...action.payload, ...state.resources], "name"),
};
},
patchResource: (state, action: PayloadAction>) => {
return {
...state,
resources: state.resources.map((resource) => {
- if (resource.id === action.payload.id) {
+ if (resource.name === action.payload.name) {
return {
...resource,
...action.payload,
diff --git a/web/src/store/v1/resource.ts b/web/src/store/v1/resource.ts
index e4aacbbc..91a79a89 100644
--- a/web/src/store/v1/resource.ts
+++ b/web/src/store/v1/resource.ts
@@ -4,62 +4,30 @@ import { resourceServiceClient } from "@/grpcweb";
import { Resource } from "@/types/proto/api/v2/resource_service";
interface State {
- resourceMapById: Record;
+ resourceMapByName: Record;
}
const getDefaultState = (): State => ({
- resourceMapById: {},
+ resourceMapByName: {},
});
export const useResourceStore = create(
combine(getDefaultState(), (set, get) => ({
setState: (state: State) => set(state),
getState: () => get(),
- getOrFetchResourceById: async (id: number, options?: { skipCache?: boolean; skipStore?: boolean }) => {
- const resourceMap = get().resourceMapById;
- const resource = resourceMap[id];
- if (resource && !options?.skipCache) {
- return resource;
- }
-
- const res = await resourceServiceClient.getResource({
- id,
- });
- if (!res.resource) {
- throw new Error("Resource not found");
- }
-
- if (!options?.skipStore) {
- resourceMap[id] = res.resource;
- set({ resourceMapById: resourceMap });
- }
- return res.resource;
- },
- getResourceById: (id: number) => {
- return get().resourceMapById[id];
- },
- getOrFetchResourceByName: async (name: string, options?: { skipCache?: boolean; skipStore?: boolean }) => {
- const resourceMap = get().resourceMapById;
- const cachedResource = Object.values(resourceMap).find((r) => r.name === name);
- if (cachedResource && !options?.skipCache) {
- return cachedResource;
- }
-
- const { resource } = await resourceServiceClient.getResourceByName({
- name,
+ searchResources: async (filter: string) => {
+ const { resources } = await resourceServiceClient.searchResources({
+ filter,
});
- if (!resource) {
- throw new Error("Resource not found");
- }
-
- if (!options?.skipStore) {
- resourceMap[resource.id] = resource;
- set({ resourceMapById: resourceMap });
+ const resourceMap = get().resourceMapByName;
+ for (const resource of resources) {
+ resourceMap[resource.name] = resource;
}
- return resource;
+ set({ resourceMapByName: resourceMap });
+ return resources;
},
getResourceByName: (name: string) => {
- const resourceMap = get().resourceMapById;
+ const resourceMap = get().resourceMapByName;
return Object.values(resourceMap).find((r) => r.name === name);
},
})),
diff --git a/web/src/types/modules/resource.d.ts b/web/src/types/modules/resource.d.ts
index dc80ed84..8b649d7e 100644
--- a/web/src/types/modules/resource.d.ts
+++ b/web/src/types/modules/resource.d.ts
@@ -1,5 +1,3 @@
-type ResourceId = number;
-
interface ResourceCreate {
filename: string;
externalLink: string;
diff --git a/web/src/utils/resource.ts b/web/src/utils/resource.ts
index 32bcbf8d..67fdf579 100644
--- a/web/src/utils/resource.ts
+++ b/web/src/utils/resource.ts
@@ -5,7 +5,7 @@ export const getResourceUrl = (resource: Resource) => {
return resource.externalLink;
}
- return `${import.meta.env.VITE_API_BASE_URL || window.location.origin}/o/r/${resource.name}`;
+ return `${import.meta.env.VITE_API_BASE_URL || window.location.origin}/o/r/${resource.uid}`;
};
export const getResourceType = (resource: Resource) => {