Skip to content

chore: add new icon to components and toolkit #11278

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
Nil20 merged 7 commits into from
Dec 12, 2025
+37 −7
Merged

chore: add new icon to components and toolkit #11278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cdc3e01
chore: add new icon to components and toolkit
Dec 10, 2025
1e99cfd
fix: handle multiple custom action scope types
Dec 10, 2025
dfaa094
Merge branch 'develop' into ocrvs-11271
Nil20 Dec 10, 2025
2069666
fix: remove redundant type assertion
Dec 10, 2025
f541439
fix: amend custom action type in event config for stories
Dec 10, 2025
25b7b86
fix: add button id for next page id
Dec 11, 2025
1191623
Merge branch 'develop' into ocrvs-11271
Nil20 Dec 11, 2025
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
2 changes: 1 addition & 1 deletion packages/client/.storybook/preview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ const tennisClubMembershipEventWithCustomAction = {
actions: tennisClubMembershipEvent.actions.concat([
{
type: ActionType.CUSTOM,
customActionType: 'CONFIRM',
customActionType: 'Approve',
label: {
id: 'event.tennis-club-membership.action.confirm.label',
defaultMessage: 'Confirm',
Expand Down
17 changes: 16 additions & 1 deletion ...v2-events/features/workqueues/EventOverview/components/useAllowedActionConfigurations.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,6 +577,7 @@ function useCustomActionConfigs(
customActionModal: React.ReactNode
customActionConfigs: ActionMenuItem[]
} {
// eslint-disable-next-line react-hooks/exhaustive-deps
const scopes = useSelector(getScope) ?? []
const { eventConfiguration } = useEventConfiguration(event.type)
const { customActionModal, onCustomAction } = useCustomActionModal(event)
Expand All @@ -593,6 +594,14 @@ function useCustomActionConfigs(
(action): action is CustomActionConfig =>
action.type === ActionType.CUSTOM
)
.filter((action) =>
configurableEventScopeAllowed(
scopes,
['record.custom-action'],
event.type,
action.customActionType
)
)
Comment on lines +597 to +604
Copy link
Contributor

@cibelius cibelius Dec 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought this was already done somewhere, as custom actions didnt show up unless you had the scope for it! I was mistaken I guess 😲

Copy link
Contributor Author

@Nil20 Nil20 Dec 12, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah! we weren't giving multiple custom action scopes to a single user, that's probably why it wasn't caught until now

.map((action) => ({
label: action.label,
icon: action.icon ?? ('PencilLine' as const),
Expand All @@ -603,7 +612,13 @@ function useCustomActionConfigs(
type: ActionType.CUSTOM,
customActionType: action.customActionType
}))
}, [eventConfiguration, onCustomAction, isDownloadedAndAssignedToUser])
}, [
eventConfiguration.actions,
scopes,
event.type,
isDownloadedAndAssignedToUser,
onCustomAction
])

const hasCustomActionScope = configurableEventScopeAllowed(
scopes,
Expand Down
18 changes: 15 additions & 3 deletions packages/commons/src/events/scopes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import {
ConfigurableScopeType,
findScope,
getAuthorizedEventsFromScopes,
RecordScopeType,
Scope
Scope,
RecordScopeType
} from '../scopes'
import {
ClientSpecificAction,
Expand Down Expand Up @@ -65,7 +65,8 @@ export function hasAnyOfScopes(a: Scope[], b: Scope[]) {
export function configurableEventScopeAllowed(
scopes: Scope[],
allowedConfigurableScopes: ConfigurableScopeType[],
eventType: string
eventType: string,
customActionType?: string
) {
// Find the scopes that are authorized for the given action
const parsedScopes = allowedConfigurableScopes
Expand All @@ -74,6 +75,17 @@ export function configurableEventScopeAllowed(

// Ensure that the given event type is authorized in the found scopes
const authorizedEvents = getAuthorizedEventsFromScopes(parsedScopes)
const firstScope = parsedScopes[0]
if (
parsedScopes.length > 0 &&
firstScope.type === 'record.custom-action' &&
customActionType
) {
const allowedCustomActionTypes = firstScope.options.customActionType
if (!allowedCustomActionTypes.includes(customActionType)) {
return false
}
}
return authorizedEvents.includes(eventType)
}

Expand Down
1 change: 1 addition & 0 deletions packages/commons/src/icons.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ export const AvailableIcons = z.enum([
'Users',
'WarningCircle',
'X',
'ChatText',
'CircleWavyCheck',
'CircleWavyQuestion',
'ArchiveBox',
Expand Down
2 changes: 1 addition & 1 deletion packages/commons/src/scopes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ export const ConfigurableActionScopes = z.discriminatedUnion('type', [
CustomActionScope
])

type ConfigurableRawScopes = z.infer<typeof ConfigurableRawScopes>
export type ConfigurableRawScopes = z.infer<typeof ConfigurableRawScopes>
export type ConfigurableScopeType = ConfigurableRawScopes['type']

type FlattenedSearchScope = {
Expand Down
3 changes: 2 additions & 1 deletion packages/components/src/Icon/all-icons.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ export {
WarningCircle,
Webcam,
X,
Stamp
Stamp,
ChatText
} from 'phosphor-react'
export * from './custom-icons'
1 change: 1 addition & 0 deletions packages/components/src/Pagination/Pagination.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ export const Pagination = ({
})}
</StyledPagination>
<Button
id="next-page-button"
type="icon"
size="small"
onClick={() => {
Expand Down