Skip to content
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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Show only those facilties that aren't linked to user #6253

Merged
merged 9 commits into from
Oct 31, 2023
Merged

Show only those facilties that aren't linked to user #6253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
daa88cd
only show unlinked facilties
Pranshu1902 Sep 9, 2023
dae55fb
Merge branch 'develop' into linked
Pranshu1902 Sep 9, 2023
e53bccd
rename param
Pranshu1902 Sep 10, 2023
6bddced
Merge branch 'develop' into linked
nihal467 Oct 3, 2023
28d77b3
Merge branch 'develop' into linked
Pranshu1902 Oct 16, 2023
d9f9f1d
fix cypress for updated backend
Pranshu1902 Oct 16, 2023
c7edea7
Merge branch 'develop' into linked
nihal467 Oct 25, 2023
e493711
merge origin develop
Pranshu1902 Oct 30, 2023
252188a
fix typo
Pranshu1902 Oct 30, 2023
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
9 changes: 1 addition & 8 deletions cypress/e2e/users_spec/user_creation.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,14 +120,7 @@ describe("User Creation", () => {
// .click()
// .type("Dummy Facility 1")
// .wait("@getFacilities");
// cy.get("li[role='option']").first().click();
// cy.intercept(/\/api\/v1\/users\/\w+\/add_facility\//).as("addFacility");
// cy.get("button[id='link-facility']").click();
// cy.wait("@addFacility")
// // .its("response.statusCode")
// // .should("eq", 201)
// .get("span")
// .contains("Facility - User Already has permission to this facility");
// cy.get("li[role='option']").should("not.exist");
// });

// describe("Edit User Profile & Error Validation", () => {
Expand Down
3 changes: 3 additions & 0 deletions src/Components/Common/FacilitySelect.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { FacilityModel } from "../Facility/models";

interface FacilitySelectProps {
name: string;
exclude_user: string;
errors?: string | undefined;
className?: string;
searchAll?: boolean;
Expand All @@ -22,6 +23,7 @@ interface FacilitySelectProps {
export const FacilitySelect = (props: FacilitySelectProps) => {
const {
name,
exclude_user,
multiple,
selected,
setSelected,
Expand All @@ -45,6 +47,7 @@ export const FacilitySelect = (props: FacilitySelectProps) => {
search_text: text,
all: searchAll,
facility_type: facilityType,
exclude_user: exclude_user,
district,
};

Expand Down
1 change: 1 addition & 0 deletions src/Components/Users/ManageUsers.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,6 +706,7 @@ function UserFacilities(props: { user: any }) {
<FacilitySelect
multiple={false}
name="facility"
exclude_user={username}
showAll={false} // Show only facilities that user has access to link (not all facilities)
showNOptions={8}
selected={facility}
Expand Down
Loading