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.

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

Ocrvs 6909 #8084

Merged
merged 28 commits into from
Dec 24, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
fb58069
chore!: introduce new parameter to query for checking workqueue data
Nil20 Nov 26, 2024
2ab4e6e
chore: amend search query error message
Nil20 Nov 26, 2024
5c2b01e
Revert "chore!: introduce new parameter to query for checking workque…
Nil20 Nov 26, 2024
2697f0a
chore: modify search query for no search scope
Nil20 Nov 26, 2024
ab7919a
chore: update advanced search tabs based on search scopes
Nil20 Nov 26, 2024
330ed06
fix: update advanced search url name
Nil20 Nov 26, 2024
e33bbcc
refactor: update event search scopes of client
Nil20 Nov 26, 2024
9891ff1
fix: update header component to use custom hook for search scope perm…
Nil20 Nov 26, 2024
4da60be
fix: add comment for new release scope
Nil20 Nov 27, 2024
2cf5a35
fix: amend advance search tab
Nil20 Nov 27, 2024
ee061c6
fix: update in progress tab
Nil20 Nov 29, 2024
70610aa
chore: update event search param of advance search based on scopes
Nil20 Nov 29, 2024
222db41
Merge branch 'configurable-roles' into ocrvs-6909
Nil20 Dec 2, 2024
d94227d
chore!: update searching with jurisdiction scopes
Nil20 Dec 3, 2024
babf055
chore: revert client changes to pass declarationLocationId
Nil20 Dec 4, 2024
f0d3696
fix: amend searching using jurisdiction params
Nil20 Dec 4, 2024
2db4f53
chore: amend form tab extra props
Nil20 Dec 10, 2024
35937ac
chore: amend gateway search communication payload
Nil20 Dec 10, 2024
d7e00f9
Merge branch 'configurable-roles' into ocrvs-6909
Zangetsu101 Dec 12, 2024
400c571
chore: add comment to add additional params to search
Nil20 Dec 12, 2024
4319447
Merge branch 'configurable-roles' into ocrvs-6909
Zangetsu101 Dec 23, 2024
8c29231
style: remove unnecessary changes
Zangetsu101 Dec 23, 2024
c0ff6f1
feat: transform search params depending on scopes
Zangetsu101 Dec 24, 2024
51d16c2
feat: respect search scope when searching
Zangetsu101 Dec 24, 2024
c57c4d1
feat: tighten elasticsearch search param types
Zangetsu101 Dec 24, 2024
5031b38
test: add mocks for data sources
Zangetsu101 Dec 24, 2024
d8ce995
test: change event search params
Zangetsu101 Dec 24, 2024
10cab5e
test: update search result mock & set search scope
Zangetsu101 Dec 24, 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
style: remove unnecessary changes
  • Loading branch information
Zangetsu101 committed Dec 23, 2024
commit 8c292314f881f1cd91ced5d4be40c153cfddb18d
2 changes: 1 addition & 1 deletion packages/client/src/workqueue/reducer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ async function getWorkqueueData(
const registrationLocationId =
(userDetails && getUserLocation(userDetails).id) || ''

const scope = getScope(state)!
const scope = getScope(state)
const reviewStatuses =
scope && scope.includes(SCOPES.RECORD_REGISTER)
? [
Expand Down
38 changes: 18 additions & 20 deletions packages/components/src/FormTabs/FormTabs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,26 +35,24 @@ function FormTabsComponent<T extends string | number = string>({
}: IFormTabProps<T>) {
return (
<Tabs>
{sections.map(({ title, id, disabled, icon, color }) => {
return (
<Tab
id={`tab_${id}`}
color={color}
onClick={() => onTabClick(id)}
key={id}
active={activeTabId === id}
disabled={disabled}
activeColor={color}
>
<Stack>
{icon}
<Text variant="bold14" element="span" color={color ?? 'primary'}>
{title}
</Text>
</Stack>
</Tab>
)
})}
{sections.map(({ title, id, disabled, icon, color }) => (
<Tab
id={`tab_${id}`}
color={color}
onClick={() => onTabClick(id)}
key={id}
active={activeTabId === id}
disabled={disabled}
activeColor={color}
>
<Stack>
{icon}
<Text variant="bold14" element="span" color={color ?? 'primary'}>
{title}
</Text>
</Stack>
</Tab>
))}
</Tabs>
)
}
Expand Down