Skip to content

#4795 - Filtrer les entreprises en statut utilisateur PENDING sur le dashboard entreprise #5187

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
tpicaud merged 2 commits into from
Jun 29, 2026
Merged

#4795 - Filtrer les entreprises en statut utilisateur PENDING sur le dashboard entreprise #5187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54b7180
filter pending status for establishment dashboard
tpicaud Jun 15, 2026
4d4f6e7
fix establishment dashboard tab button for playwright
tpicaud Jun 17, 2026
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
17 changes: 9 additions & 8 deletions ...t/src/app/components/establishment/establishment-dashboard/EstablishmentDashboardTabs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import {
frontRoutes,
immersionFacileHelpdeskRootUrl,
onlyAdminUserRightsWithStatusAccepted,
type UserEstablishmentRightDetails,
} from "shared";
import { ConventionTemplatesList } from "src/app/components/agency/agency-dashboard/ConventionTemplatesList";
import { DiscussionTabContent } from "src/app/components/DiscussionContentTab";
Expand Down Expand Up @@ -59,7 +60,7 @@ export const EstablishmentDashboardTabs = ({
const tabs = useMemo(
() =>
getDashboardTabs(
makeEstablishmentDashboardTabs(currentUser, route, userHasDiscussions),
makeEstablishmentDashboardTabs(currentUser, userHasDiscussions),
currentTab,
),
[currentUser, currentTab, route, userHasDiscussions],
Expand Down Expand Up @@ -118,6 +119,11 @@ export const EstablishmentDashboardTabs = ({
</>
);
};
const filterActiveEstablishmentsForUser = (
establishment: UserEstablishmentRightDetails,
) =>
!establishment.isEstablishmentBanned &&
onlyAdminUserRightsWithStatusAccepted(establishment);

const makeEstablishmentDashboardTabs = (
{
Expand All @@ -126,18 +132,13 @@ const makeEstablishmentDashboardTabs = (
},
establishments,
}: ConnectedUser,
route: FrontEstablishmentDashboardRoute,
userHasDiscussions: boolean,
): DashboardTab[] => {
const establishmentsArray = establishments
? establishments.filter(
(establishment) => !establishment.isEstablishmentBanned,
)
? establishments.filter(filterActiveEstablishmentsForUser)
: [];
const userIsOnboarding = establishmentsArray.length === 0;
const userCanManageEstablishments =
establishmentsArray.filter(onlyAdminUserRightsWithStatusAccepted).length >
0;
const userCanManageEstablishments = establishmentsArray.length > 0;

return [
{
Expand Down
2 changes: 1 addition & 1 deletion playwright/tests/establishment/establishmentNavigation.utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export const goToManageEstablishmentThroughEstablishmentDashboard = async (
.locator(`#${domElementIds.header.navLinks.establishment.dashboard}`)
.click();
await expect(await page.locator(".fr-tabs__list li")).toHaveCount(3);
await page.locator(".fr-tabs__list").getByText("Mes établissements").click();
await page.locator(".fr-tabs__list").getByText("Mon établissement").click();
const establishmentSelector = await page.locator(
`#${domElementIds.establishmentDashboard.manageEstablishments.selectEstablishmentInput}`,
);
Expand Down
Loading