Skip to content

Commit

Permalink
Merge branch 'master' into STSMACOM-787
Browse files Browse the repository at this point in the history
  • Loading branch information
BogdanDenis authored Oct 31, 2023
2 parents a2190d5 + 2641cd5 commit 3f059de
Show file tree
Hide file tree
Showing 8 changed files with 286 additions and 8 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
* *BREAKING* bump `react-intl` to `v6.4.4`. Refs STSMACOM-780.
* Add possible to pass `paneTitleRef` from `SearchAndSort` to `Pane` that already support `paneTitleRef`. Refs STSMACOM-779.
* Correctly save empty list when all custom fields are removed. Refs STSMACOM-781.
* *BREAKING* Handle access-control via cookies. Refs STSMACOM-714.

## [8.0.0](https://github.com/folio-org/stripes-smart-components/tree/v8.0.0) (2023-01-30)
[Full Changelog](https://github.com/folio-org/stripes-smart-components/compare/v7.3.0...v8.0.0)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ const propTypes = {
isReduxForm: PropTypes.bool,
okapi: PropTypes.shape({
tenant: PropTypes.string.isRequired,
token: PropTypes.string.isRequired,
url: PropTypes.string.isRequired,
}).isRequired,
onToggle: PropTypes.func,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ const propTypes = {
intl: PropTypes.object,
okapi: PropTypes.shape({
tenant: PropTypes.string.isRequired,
token: PropTypes.string.isRequired,
url: PropTypes.string.isRequired,
}).isRequired,
permissions: permissionsShape.isRequired,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ const propTypes = {
noCustomFieldsFoundLabel: PropTypes.node,
okapi: PropTypes.shape({
tenant: PropTypes.string.isRequired,
token: PropTypes.string.isRequired,
url: PropTypes.string.isRequired,
}).isRequired,
onToggle: PropTypes.func.isRequired,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ const propTypes = {
entityType: PropTypes.string.isRequired,
okapi: PropTypes.shape({
tenant: PropTypes.string.isRequired,
token: PropTypes.string.isRequired,
url: PropTypes.string.isRequired,
}).isRequired,
permissions: permissionsShape.isRequired,
Expand Down
4 changes: 3 additions & 1 deletion lib/CustomFields/utils/makeRequest.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
export default okapi => moduleId => path => options => {
const headers = {
'x-okapi-token': okapi.token,
'x-okapi-tenant': okapi.tenant,
'content-type': 'application/json',
...(okapi.token && { 'x-okapi-token': okapi.token }),
...options.headers,
};

const okapiModuleId = moduleId ? { 'x-okapi-module-id': moduleId } : {};

return fetch(`${okapi.url}/${path}`, {
credentials: 'include',
mode: 'cors',
...options,
headers: {
...headers,
Expand Down
6 changes: 3 additions & 3 deletions translations/stripes-smart-components/es_ES.json
Original file line number Diff line number Diff line change
Expand Up @@ -248,8 +248,8 @@
"customFields.save&Close": "Save & close",
"customFields.option.delete.warning": "Deleting the field <b>{fieldName}'s</b> option <b>{optionName}.</b> No data stored for this options.",
"notes.titleAndDetails": "Title and details",
"notes.showLessDetails": "Show less",
"notes.showMoreDetails": "Show more",
"notes.showLessDetails": "Mostrar menos",
"notes.showMoreDetails": "Mostrar más",
"clipCopy.success": "Successfully copied \"{text}\" to clipboard.",
"cannotSaveNewTag": "Cannot create new tag: you may not have the required permissions.",
"cannotSaveTagToRecord": "Cannot save tag data to record. Check that you have the required permissions.",
Expand All @@ -275,5 +275,5 @@
"error.conflict": "You are editing an old version of this data. To load the latest version click cancel, <b>refresh the page</b> and try again.",
"editableList.actionsColumnHeader": "Acciones",
"customFields.option.deleteLabel": "Delete",
"advancedSearch": "Advanced search"
"advancedSearch": "Búsqueda avanzada"
}
279 changes: 279 additions & 0 deletions translations/stripes-smart-components/sk.json

Large diffs are not rendered by default.

0 comments on commit 3f059de

Please sign in to comment.