github-starred/komodo
2
0
Fork 1
mirror of https://github.com/moghtech/komodo.git synced 2026-04-28 03:38:55 -05:00
Code Issues 3.1k Packages Projects Releases 103 Wiki Activity

fix remove recents on delete

Browse Source
This commit is contained in:
mbecker20
2024-08-12 00:33:08 -07:00
parent 8d75fa3f2f
commit 8a0109522b
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
bin/core/src/resource/mod.rs
View File

@@ -780,13 +780,17 @@ where
{
let resource: ResourceTarget = resource.into();
let (recent_field, id) = match resource {
ResourceTarget::Server(id) => ("recent_servers", id),
ResourceTarget::Deployment(id) => ("recent_deployments", id),
ResourceTarget::Build(id) => ("recent_builds", id),
ResourceTarget::Repo(id) => ("recent_repos", id),
ResourceTarget::Procedure(id) => ("recent_procedures", id),
// Don't need to do anything for others
_ => return,
ResourceTarget::Server(id) => ("recents.Server", id),
ResourceTarget::Deployment(id) => ("recents.Deployment", id),
ResourceTarget::Build(id) => ("recents.Build", id),
ResourceTarget::Repo(id) => ("recents.Repo", id),
ResourceTarget::Procedure(id) => ("recents.Procedure", id),
ResourceTarget::Stack(id) => ("recents.Stack", id),
ResourceTarget::Builder(id) => ("recents.Builder", id),
ResourceTarget::Alerter(id) => ("recents.Alerter", id),
ResourceTarget::ServerTemplate(id) => ("recents.ServerTemplate", id),
ResourceTarget::ResourceSync(id) => ("recents.ResourceSync", id),
ResourceTarget::System(_) => return
};
if let Err(e) = db_client()
.await

10
frontend/src/pages/home/dashboard.tsx
View File

@@ -51,9 +51,13 @@ export const Dashboard = () => {
};
const ResourceRow = ({ type }: { type: UsableResource }) => {
const recents = useUser().data?.recents?.[type]?.slice(0, 6);
const resources = useRead(`List${type}s`, {})
.data?.filter((r) => !recents?.includes(r.id))
const _recents = useUser().data?.recents?.[type]?.slice(0, 6);
const _resources = useRead(`List${type}s`, {}).data;
const recents = _recents?.filter(
(recent) => !_resources?.every((resource) => resource.id !== recent)
);
const resources = _resources
?.filter((r) => !recents?.includes(r.id))
.map((r) => r.id);
const ids = [
...(recents ?? []),