-
Notifications
You must be signed in to change notification settings - Fork 733
Add multi-select organization filter in members, organizations and activities lists #1560
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.
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
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
0dc4ce4
Add multi-select organization filter in members, organizations and ac…
peoray 4f79805
Merge branch 'main' of github.com:peoray/crowd.dev into organization-…
peoray 7f53316
fix css issues for organization filter
peoray a9e58b0
Merge branch 'main' into organization-filters
peoray fc28c9d
Merge branch 'organization-filters' of github.com:peoray/crowd.dev in…
peoray File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
54 changes: 54 additions & 0 deletions
54
frontend/src/modules/activity/config/filters/organizations/config.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
import { FilterConfigType } from '@/shared/modules/filters/types/FilterConfig'; | ||
import { itemLabelRendererByType } from '@/shared/modules/filters/config/itemLabelRendererByType'; | ||
import { | ||
MultiSelectAsyncFilterConfig, | ||
MultiSelectAsyncFilterOptions, MultiSelectAsyncFilterValue, | ||
} from '@/shared/modules/filters/types/filterTypes/MultiSelectAsyncFilterConfig'; | ||
import { OrganizationService } from '@/modules/organization/organization-service'; | ||
import { DEFAULT_ORGANIZATION_FILTERS } from '@/modules/organization/store/constants'; | ||
|
||
const organizations: MultiSelectAsyncFilterConfig = { | ||
id: 'organizations', | ||
label: 'Organization', | ||
iconClass: 'ri-community-line', | ||
type: FilterConfigType.MULTISELECT_ASYNC, | ||
options: { | ||
remoteMethod: (query) => OrganizationService.listAutocomplete(query, 10) | ||
.then((data: any[]) => data.map((organization) => ({ | ||
label: organization.label, | ||
value: organization.id, | ||
logo: organization.logo, | ||
}))), | ||
remotePopulateItems: (ids: string[]) => OrganizationService.listAutocomplete({ | ||
filter: { | ||
and: [ | ||
...DEFAULT_ORGANIZATION_FILTERS, | ||
{ | ||
id: { in: ids }, | ||
}, | ||
], | ||
}, | ||
orderBy: null, | ||
limit: ids.length, | ||
offset: 0, | ||
}) | ||
.then(({ rows }: any) => rows.map((organization: any) => ({ | ||
label: organization.displayName, | ||
value: organization.id, | ||
logo: organization.logo, | ||
}))), | ||
}, | ||
itemLabelRenderer(value: MultiSelectAsyncFilterValue, options: MultiSelectAsyncFilterOptions, data: any): string { | ||
return itemLabelRendererByType[FilterConfigType.MULTISELECT_ASYNC]('Organization', value, options, data); | ||
}, | ||
apiFilterRenderer({ value, include }: MultiSelectAsyncFilterValue): any[] { | ||
const filter = { | ||
organizationId: value, | ||
}; | ||
return [ | ||
(include ? filter : { not: filter }), | ||
]; | ||
}, | ||
}; | ||
|
||
export default organizations; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
54 changes: 54 additions & 0 deletions
54
frontend/src/modules/member/config/filters/organizations/config.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
import { FilterConfigType } from '@/shared/modules/filters/types/FilterConfig'; | ||
import { itemLabelRendererByType } from '@/shared/modules/filters/config/itemLabelRendererByType'; | ||
import { | ||
MultiSelectAsyncFilterConfig, | ||
MultiSelectAsyncFilterOptions, MultiSelectAsyncFilterValue, | ||
} from '@/shared/modules/filters/types/filterTypes/MultiSelectAsyncFilterConfig'; | ||
import { OrganizationService } from '@/modules/organization/organization-service'; | ||
import { DEFAULT_ORGANIZATION_FILTERS } from '@/modules/organization/store/constants'; | ||
|
||
const organizations: MultiSelectAsyncFilterConfig = { | ||
id: 'organizations', | ||
label: 'Organization', | ||
iconClass: 'ri-community-line', | ||
type: FilterConfigType.MULTISELECT_ASYNC, | ||
options: { | ||
remoteMethod: (query) => OrganizationService.listAutocomplete(query, 10) | ||
.then((data: any[]) => data.map((organization) => ({ | ||
label: organization.label, | ||
value: organization.id, | ||
logo: organization.logo, | ||
}))), | ||
remotePopulateItems: (ids: string[]) => OrganizationService.listAutocomplete({ | ||
filter: { | ||
and: [ | ||
...DEFAULT_ORGANIZATION_FILTERS, | ||
{ | ||
id: { in: ids }, | ||
}, | ||
], | ||
}, | ||
orderBy: null, | ||
limit: ids.length, | ||
offset: 0, | ||
}) | ||
.then(({ rows }: any) => rows.map((organization: any) => ({ | ||
label: organization.displayName, | ||
value: organization.id, | ||
logo: organization.logo, | ||
}))), | ||
}, | ||
itemLabelRenderer(value: MultiSelectAsyncFilterValue, options: MultiSelectAsyncFilterOptions, data: any): string { | ||
return itemLabelRendererByType[FilterConfigType.MULTISELECT_ASYNC]('Organization', value, options, data); | ||
}, | ||
apiFilterRenderer({ value, include }: MultiSelectAsyncFilterValue): any[] { | ||
const filter = { | ||
or: value.map((id) => ({ organizations: { eq: id } })), | ||
}; | ||
return [ | ||
(include ? filter : { not: filter }), | ||
]; | ||
}, | ||
}; | ||
|
||
export default organizations; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
54 changes: 54 additions & 0 deletions
54
frontend/src/modules/organization/config/filters/organizations/config.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
import { FilterConfigType } from '@/shared/modules/filters/types/FilterConfig'; | ||
import { itemLabelRendererByType } from '@/shared/modules/filters/config/itemLabelRendererByType'; | ||
import { | ||
MultiSelectAsyncFilterConfig, | ||
MultiSelectAsyncFilterOptions, MultiSelectAsyncFilterValue, | ||
} from '@/shared/modules/filters/types/filterTypes/MultiSelectAsyncFilterConfig'; | ||
import { OrganizationService } from '@/modules/organization/organization-service'; | ||
import { DEFAULT_ORGANIZATION_FILTERS } from '@/modules/organization/store/constants'; | ||
|
||
const organizations: MultiSelectAsyncFilterConfig = { | ||
id: 'organizations', | ||
label: 'Organization', | ||
iconClass: 'ri-community-line', | ||
type: FilterConfigType.MULTISELECT_ASYNC, | ||
options: { | ||
remoteMethod: (query) => OrganizationService.listAutocomplete(query, 10) | ||
.then((data: any[]) => data.map((organization) => ({ | ||
label: organization.label, | ||
value: organization.id, | ||
logo: organization.logo, | ||
}))), | ||
remotePopulateItems: (ids: string[]) => OrganizationService.listAutocomplete({ | ||
filter: { | ||
and: [ | ||
...DEFAULT_ORGANIZATION_FILTERS, | ||
{ | ||
id: { in: ids }, | ||
}, | ||
], | ||
}, | ||
orderBy: null, | ||
limit: ids.length, | ||
offset: 0, | ||
}) | ||
.then(({ rows }: any) => rows.map((organization: any) => ({ | ||
label: organization.displayName, | ||
value: organization.id, | ||
logo: organization.logo, | ||
}))), | ||
}, | ||
itemLabelRenderer(value: MultiSelectAsyncFilterValue, options: MultiSelectAsyncFilterOptions, data: any): string { | ||
return itemLabelRendererByType[FilterConfigType.MULTISELECT_ASYNC]('Organization', value, options, data); | ||
}, | ||
apiFilterRenderer({ value, include }: MultiSelectAsyncFilterValue): any[] { | ||
const filter = { | ||
or: value.map((id) => ({ id: { eq: id } })), | ||
}; | ||
return [ | ||
(include ? filter : { not: filter }), | ||
]; | ||
}, | ||
}; | ||
|
||
export default organizations; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.