Skip to content

fix(site): fix resource selection when workspace resources change #11581

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 12, 2024
Merged

fix(site): fix resource selection when workspace resources change #11581

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1222a24
fix(site): fix resource selection when workspace resources change
BrunoQuaresma Jan 11, 2024
8c6e334
Apply improvements from PRs
BrunoQuaresma Jan 12, 2024
1d2e8f3
Use effect event
BrunoQuaresma Jan 12, 2024
032c3a1
Merge branch 'main' of https://github.com/coder/coder into bq/fix-emp…
BrunoQuaresma Jan 12, 2024
ec2282e
Add more comments about the solution
BrunoQuaresma Jan 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Apply improvements from PRs
  • Loading branch information
@BrunoQuaresma
BrunoQuaresma committed Jan 12, 2024
commit 8c6e3341936504dc39f8e47af04ec7b65130550d
36 changes: 20 additions & 16 deletions site/src/pages/WorkspacePage/useResourcesNav.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,37 @@
import { WorkspaceResource } from "api/typesGenerated";
import { useTab } from "hooks";
import { useCallback, useEffect } from "react";
import { useCallback, useEffect, useMemo } from "react";

export const resourceOptionId = (resource: WorkspaceResource) => {
return `${resource.type}_${resource.name}`;
};

export const useResourcesNav = (resources: WorkspaceResource[]) => {
const resourcesNav = useTab("resources", "");
const selectedResource = resources.find(
(r) => resourceOptionId(r) === resourcesNav.value,
const firstResource = useMemo(
() => (resources.length > 0 ? resources[0] : undefined),
[resources],
);
const resourcesNav = useTab(
"resources",
firstResource ? resourceOptionId(firstResource) : "",
);

const isSelected = useCallback(
(resource: WorkspaceResource) => {
return resourceOptionId(resource) === resourcesNav.value;
},
[resourcesNav.value],
);

const selectedResource = resources.find(isSelected);

useEffect(() => {
const hasResourcesWithAgents =
resources.length > 0 &&
resources[0].agents &&
resources[0].agents.length > 0;
firstResource && firstResource.agents && firstResource.agents.length > 0;
if (!selectedResource && hasResourcesWithAgents) {
resourcesNav.set(resourceOptionId(resources[0]));
resourcesNav.set(resourceOptionId(firstResource));
}
}, [resources, selectedResource, resourcesNav]);
}, [firstResource, resourcesNav, selectedResource]);

const select = useCallback(
(resource: WorkspaceResource) => {
Expand All @@ -29,13 +40,6 @@ export const useResourcesNav = (resources: WorkspaceResource[]) => {
[resourcesNav],
);

const isSelected = useCallback(
(resource: WorkspaceResource) => {
return resourceOptionId(resource) === resourcesNav.value;
},
[resourcesNav.value],
);

return {
isSelected,
select,
Expand Down