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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UIIN-2634: Set tenant from stripes.okapi.tenant if location.state is empty (follow-up) #2323

Merged
merged 10 commits into from
Oct 31, 2023
Merged

UIIN-2634: Set tenant from stripes.okapi.tenant if location.state is empty (follow-up) #2323

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
460554a
UIIN-2634: Remove error when search for an item
OleksandrHladchenko1 Oct 23, 2023
1237d20
UIIN-2634: Fix tests
OleksandrHladchenko1 Oct 23, 2023
deb0c21
UIIN-2634: set tenant from stripes.okapi.tenant if location.state is …
OleksandrHladchenko1 Oct 27, 2023
6823dbd
Merge branch 'master' into UIIN-2634
OleksandrHladchenko1 Oct 27, 2023
181eb44
Set !{tenantTo} instead of !{location.state.tenantTo} in holdings/ite…
OleksandrHladchenko1 Oct 30, 2023
15d216b
UIIN-2634: Remove unused methods in ItemRoute component
OleksandrHladchenko1 Oct 30, 2023
5f00d91
Merge branch 'master' into UIIN-2634
OleksandrHladchenko1 Oct 30, 2023
b0f15a3
Merge branch 'master' into UIIN-2634
OleksandrHladchenko1 Oct 31, 2023
e21dc02
UIIN-2634: Fix code smell
OleksandrHladchenko1 Oct 31, 2023
894fb8c
UIIN-2634: get rid of getRequestsPath variable
OleksandrHladchenko1 Oct 31, 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
18 changes: 16 additions & 2 deletions src/ViewHoldingsRecord.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,14 @@ class ViewHoldingsRecord extends React.Component {
path: 'holdings-storage/holdings/:{holdingsrecordid}',
resourceShouldRefresh: false,
accumulate: true,
tenant: '!{location.state.tenantTo}'
tenant: (_q, _p, _r, _l, props) => {
const {
stripes,
location,
} = props;

return location?.state?.tenantTo || stripes.okapi.tenant;
OleksandrHladchenko1 marked this conversation as resolved.
Show resolved Hide resolved
},
},
items: {
type: 'okapi',
Expand All @@ -97,7 +104,14 @@ class ViewHoldingsRecord extends React.Component {
type: 'okapi',
path: 'inventory/instances/:{id}',
accumulate: true,
tenant: '!{location.state.tenantTo}'
tenant: (_q, _p, _r, _l, props) => {
const {
stripes,
location,
} = props;

return location?.state?.tenantTo || stripes.okapi.tenant;
},
},
tagSettings: {
type: 'okapi',
Expand Down
18 changes: 16 additions & 2 deletions src/routes/ItemRoute.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,14 @@ class ItemRoute extends React.Component {
path: 'inventory/items/:{itemid}',
POST: { path: 'inventory/items' },
resourceShouldRefresh: true,
tenant: '!{location.state.tenantTo}',
tenant: (_q, _p, _r, _l, props) => {
const {
stripes,
location,
} = props;

return location?.state?.tenantTo || stripes.okapi.tenant;
},
},
markItemAsWithdrawn: {
type: 'okapi',
Expand Down Expand Up @@ -101,7 +108,14 @@ class ItemRoute extends React.Component {
holdingsRecords: {
type: 'okapi',
path: 'holdings-storage/holdings/:{holdingsrecordid}',
tenant: '!{location.state.tenantTo}',
tenant: (_q, _p, _r, _l, props) => {
const {
stripes,
location,
} = props;

return location?.state?.tenantTo || stripes.okapi.tenant;
},
},
instanceRecords: {
type: 'okapi',
Expand Down
Loading