8000 Merging : US-2539 local entities by zannkukai · Pull Request #3458 · rero/rero-ils · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Merging : US-2539 local entities #3458

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
merged 14 commits into from
Sep 7, 2023
Merged

Merging : US-2539 local entities #3458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
05dec19
local entity: create new resource
lauren-d May 26, 2023
2cc0722
entities: refactoring of resources
lauren-d Jun 6, 2023
3fa31be
settings: remove obsolete settings.
zannkukai Jul 3, 2023
b48b54b
entities: complete local entities data model
lauren-d Jun 14, 2023
5e564a6
document: update type of agent entity field into document JSON schema
zannkukai Jun 21, 2023
2fbff9e
entities: configure operation logs for local entities
lauren-d Jun 26, 2023
688b6b7
entities: proxy to search local entities.
zannkukai Jul 4, 2023
11e19a7
entities: link to document
lauren-d Jul 3, 2023
957cdf6
entity: merge all ids into `pids` key
zannkukai Jul 19, 2023
2911af4
local entities: reorder the conference fields
Garfield-fr Aug 16, 2023
c8de3b7
document: add 3 new type of subjects
Garfield-fr Aug 7, 2023
f0c9b54
entities: adapt labels and descriptions
PascalRepond Aug 16, 2023
fc5b1ce
editor: fix length to maxItems on simple form
Garfield-fr Aug 7, 2023
d77acf5
entities: public view for local and remote
Garfield-fr Jul 10, 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
123 changes: 123 additions & 0 deletions data/local_entities.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
[
{
"pid": "1",
"name": "Shakespeare, William",
"date_of_birth": "1564",
"date_of_death": "1616",
"identifier": {
"source": "OCLC",
"type": "bf:Local",
"value": "https://id.oclc.org/worldcat/entity/E39PBJxx96qPfyhwWrJChP9kXd"
},
"type": "bf:Person"
},
{
"pid": "2",
"name": "Allies, Mary H.",
"date_of_birth": "1852",
"date_of_death": "1927",
"fuller_form_of_name": "Mary Helen",
"type": "bf:Person"
},
{
"pid": "3",
"name": "Frankel, Valerie Estelle",
"date_of_birth": "1980",
"type": "bf:Person"
},
{
"pid": "4",
"name": "Simberg, Hugo",
"date_of_birth": "1873",
"date_of_death": "1917",
"source_catalog": "lcsh",
"type": "bf:Person"
},
{
"pid": "5",
"name": "Vesalius, Andreas",
"date_of_birth": "1514",
"date_of_death": "1564",
"source_catalog": "lcsh",
"type": "bf:Person"
},
{
"pid": "6",
"name": "William",
"date_of_birth": "1650",
"date_of_death": "1702",
"numeration": "III",
"qualifier": "King of England",
"type": "bf:Person"
},
{
"pid": "7",
"name": "Medicine in Art.",
"source_catalog": "mesh",
"genreForm": false,
"type": "bf:Topic"
},
{
"pid": "8",
"name": "Medical Illustration.",
"genreForm": false,
"source_catalog": "mesh",
"type": "bf:Topic"
},
{
"pid": "9",
"name": "UCLouvain",
"conference": false,
"type": "bf:Organisation"
},
{
"pid": "10",
"name": "Forum on Bilateral Conversation",
"conference_numbering": "5th",
"conference_date": "1990",
"conference_place": "Budapest, Hungary",
"conference": true,
"type": "bf:Organisation"
},
{
"pid": "11",
"name": "Catholic Church",
"subordinate_units": [
"Concilium Plenarium Americae Latinae"
],
"conference_numbering": "5th",
"conference_date": "1899",
"conference_place": "Rome, Italy",
"conference": false,
"type": "bf:Organisation"
},
{
"pid": "12",
"title": "Chevalier au cygne",
"type": "bf:Work"
},
{
"pid": "13",
"title": "Sonnets",
"creator": "Shakespeare, William (1564-1616)",
"type": "bf:Work"
},
{
"pid": "14",
"title": "Preludes",
"creator": "Chopin, Fre\u0301de\u0301ric (1810-1849)",
"type": "bf:Work"
},
{
"pid": "15",
"name": "1800-1899",
"type": "bf:Temporal"
},
{
"pid": "16",
"name": "Personal correspondence",
"source_catalog": "lcgft",
"genreForm": true,
"type": "bf:Topic"
}
]
0 data/entities_big.json → data/remote_entities_big.json
View file
Open in desktop
File renamed without changes.
0 data/entities_small.json → data/remote_entities_small.json
View file
Open in desktop
File renamed without changes.
25 changes: 24 additions & 1 deletion data/role_policies.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -783,7 +783,8 @@
"pro_circulation_manager",
"pro_user_manager",
"pro_acquisition_manager",
"pro_library_administrator"
"pro_library_administrator",
"pro_entity_manager"
],
"access-circulation": [
"pro_circulation_manager",
Expand All @@ -797,5 +798,27 @@
"permission-management": [
"admin",
"pro_full_permissions"
],
"locent-access": [
"pro_full_permissions",
"pro_read_only",
"pro_catalog_manager",
"pro_circulation_manager",
"pro_user_manager",
"pro_acquisition_manager",
"pro_library_administrator",
"pro_entity_manager"
],
"locent-update": [
"pro_full_permissions",
"pro_entity_manager"
],
"locent-create": [
"pro_full_permissions",
"pro_entity_manager"
],
"locent-delete": [
"pro_full_permissions",
"pro_entity_manager"
]
}
6 changes: 6 additions & 0 deletions data/system_role_policies.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,11 @@
],
"ptre-read": [
"authenticated_user"
],
"locent-search": [
"any_user"
],
"locent-read": [
"any_user"
]
}
27 changes: 20 additions & 7 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,8 @@ acq_orders = "rero_ils.modules.acquisition.acq_orders.views:api_blueprint"
acq_receipts = "rero_ils.modules.acquisition.acq_receipts.views:api_blueprint"
api_documents = "rero_ils.modules.documents.views:api_blueprint"
circ_policies = "rero_ils.modules.circ_policies.views:blueprint"
entities = "rero_ils.modules.entities.views:api_blueprint"
local_entities = "rero_ils.modules.entities.local_entities.views:api_blueprint"
remote_entities = "rero_ils.modules.entities.remote_entities.views:api_blueprint"
documents = "rero_ils.modules.documents.views:api_blueprint"
holdings = "rero_ils.modules.holdings.api_views:api_blueprint"
imports = "rero_ils.modules.imports.views:api_blueprint"
Expand Down Expand Up @@ -199,15 +200,19 @@ templates = "rero_ils.modules.templates.views:blueprint"
theme = "rero_ils.theme.views:blueprint"
users = "rero_ils.modules.users.views:blueprint"

[tool.poetry.plugins."invenio_base.api_converters"]
nooppid = "rero_ils.converters:NoopPIDConverter"

[tool.poetry.plugins."invenio_celery.tasks"]
apiharvester = "rero_ils.modules.apiharvester.tasks"
collections = "rero_ils.modules.collections.tasks"
documents = "rero_ils.modules.documents.tasks"
entities = "rero_ils.modules.entities.tasks"
remote_entities = "rero_ils.modules.entities.remote_entities.tasks"
ebooks = "rero_ils.modules.ebooks.tasks"
holdings = "rero_ils.modules.holdings.tasks"
items = "rero_ils.modules.items.tasks"
loans = "rero_ils.modules.loans.tasks"
indexer_locent = "rero_ils.modules.entities.local_entities.indexer"
modules = "rero_ils.modules.tasks"
notifications = "rero_ils.modules.notifications.tasks"
patrons = "rero_ils.modules.patrons.tasks"
Expand Down Expand Up @@ -238,7 +243,8 @@ items = "rero_ils.modules.items.models"
libraries = "rero_ils.modules.libraries.models"
local_fields = "rero_ils.modules.local_fields.models"
locations = "rero_ils.modules.locations.models"
entities = "rero_ils.modules.entities.models"
remote_entities = "rero_ils.modules.entities.remote_entities.models"
local_entities = "rero_ils.modules.entities.local_entities.models"
notifications = "rero_ils.modules.notifications.models"
organisations = "rero_ils.modules.organisations.models"
patron_transaction_events = "rero_ils.modules.patron_transaction_events.models"
Expand All @@ -265,14 +271,15 @@ budgets = "rero_ils.modules.acquisition.budgets.jsonschemas"
circ_policies = "rero_ils.modules.circ_policies.jsonschemas"
collections = "rero_ils.modules.collections.jsonschemas"
common = "rero_ils.jsonschemas"
entities = "rero_ils.modules.entities.jsonschemas"
remote_entities = "rero_ils.modules.entities.remote_entities.jsonschemas"
documents = "rero_ils.modules.documents.jsonschemas"
holdings = "rero_ils.modules.holdings.jsonschemas"
ill_requests = "rero_ils.modules.ill_requests.jsonschemas"
item_types = "rero_ils.modules.item_types.jsonschemas"
items = "rero_ils.modules.items.jsonschemas"
libraries = "rero_ils.modules.libraries.jsonschemas"
loans = "rero_ils.modules.loans.jsonschemas"
local_entities = "rero_ils.modules.entities.local_entities.jsonschemas"
local_fields = "rero_ils.modules.local_fields.jsonschemas"
locations = "rero_ils.modules.locations.jsonschemas"
notifications = "rero_ils.modules.notifications.jsonschemas"
Expand Down Expand Up @@ -305,13 +312,14 @@ acq_receipt_line_id = "rero_ils.modules.acquisition.acq_receipt_lines.api:acq_re
budget_id = "rero_ils.modules.acquisition.budgets.api:budget_id_fetcher"
circ_policy_id = "rero_ils.modules.circ_policies.api:circ_policy_id_fetcher"
collection_id = "rero_ils.modules.collections.api:collection_id_fetcher"
entity_id = "rero_ils.modules.entities.api:entity_id_fetcher"
document_id = "rero_ils.modules.documents.api:document_id_fetcher"
remote_entity_id = "rero_ils.modules.entities.remote_entities.api:remote_entity_id_fetcher"
holding_id = "rero_ils.modules.holdings.api:holding_id_fetcher"
ill_request_id = "rero_ils.modules.ill_requests.api:ill_request_id_fetcher"
item_id = "rero_ils.modules.items.api:item_id_fetcher"
item_type_id = "rero_ils.modules.item_types.api:item_type_id_fetcher"
library_id = "rero_ils.modules.libraries.api:library_id_fetcher"
local_entity_id = "rero_ils.modules.entities.local_entities.api:local_entity_id_fetcher"
local_field_id = "rero_ils.modules.local_fields.api:local_field_id_fetcher"
location_id = "rero_ils.modules.locations.api:location_id_fetcher"
notification_id = "rero_ils.modules.notifications.api:notification_id_fetcher"
Expand All @@ -323,6 +331,7 @@ patron_transaction_id = "rero_ils.modules.patron_transactions.api:patron_transac
patron_type_id = "rero_ils.modules.patron_types.api:patron_type_id_fetcher"
stat_id = "rero_ils.modules.stats.api:stat_id_fetcher"
template_id = "rero_ils.modules.templates.api:template_id_fetcher"
entity_id = "rero_ils.modules.entities.fetchers:id_fetcher"
vendor_id = "rero_ils.modules.vendors.api:vendor_id_fetcher"

[tool.poetry.plugins."invenio_pidstore.minters"]
Expand All @@ -335,13 +344,14 @@ acq_receipt_line_id = "rero_ils.modules.acquisition.acq_receipt_lines.api:acq_re
budget_id = "rero_ils.modules.acquisition.budgets.api:budget_id_minter"
circ_policy_id = "rero_ils.modules.circ_policies.api:circ_policy_id_minter"
collection_id = "rero_ils.modules.collections.api:collection_id_minter"
entity_id = "rero_ils.modules.entities.api:entity_id_minter"
document_id = "rero_ils.modules.documents.api:document_id_minter"
remote_entity_id = "rero_ils.modules.entities.remote_entities.api:remote_entity_id_minter"
holding_id = "rero_ils.modules.holdings.api:holding_id_minter"
ill_request_id = "rero_ils.modules.ill_requests.api:ill_request_id_minter"
item_id = "rero_ils.modules.items.api:item_id_minter"
item_type_id = "rero_ils.modules.item_types.api:item_type_id_minter"
library_id = "rero_ils.modules.libraries.api:library_id_minter"
local_entity_id = "rero_ils.modules.entities.local_entities.api:local_entity_id_minter"
local_field_id = "rero_ils.modules.local_fields.api:local_field_id_minter"
location_id = "rero_ils.modules.locations.api:location_id_minter"
notification_id = "rero_ils.modules.notifications.api:notification_id_minter"
Expand All @@ -352,6 +362,7 @@ patron_transaction_id = "rero_ils.modules.patron_transactions.api:patron_transac
patron_type_id = "rero_ils.modules.patron_types.api:patron_type_id_minter"
stat_id = "rero_ils.modules.stats.api:stat_id_minter"
template_id = "rero_ils.modules.templates.api:template_id_minter"
entity_id = "rero_ils.modules.entities.minters:id_minter"
vendor_id = "rero_ils.modules.vendors.api:vendor_id_minter"

[tool.poetry.plugins."invenio_records.jsonresolver"]
Expand All @@ -371,6 +382,7 @@ items = "rero_ils.modules.items.jsonresolver"
libraries = "rero_ils.modules.libraries.jsonresolver"
loans = "rero_ils.modules.loans.jsonresolver"
local_fields = "rero_ils.modules.local_fields.jsonresolver"
local_entities = "rero_ils.modules.entities.local_entities.jsonresolver"
locations = "rero_ils.modules.locations.jsonresolver"
notifications = "rero_ils.modules.notifications.jsonresolver"
organisations = "rero_ils.modules.organisations.jsonresolver"
Expand All @@ -391,14 +403,15 @@ acq_receipts = "rero_ils.modules.acquisition.acq_receipts.mappings"
budgets = "rero_ils.modules.acquisition.budgets.mappings"
circ_policies = "rero_ils.modules.circ_policies.mappings"
collections = "rero_ils.modules.collections.mappings"
entities = "rero_ils.modules.entities.mappings"
remote_entities = "rero_ils.modules.entities.remote_entities.mappings"
documents = "rero_ils.modules.documents.mappings"
holdings = "rero_ils.modules.holdings.mappings"
ill_requests = "rero_ils.modules.ill_requests.mappings"
item_types = "rero_ils.modules.item_types.mappings"
items = "rero_ils.modules.items.mappings"
libraries = "rero_ils.modules.libraries.mappings"
loans = "rero_ils.modules.loans.mappings"
local_entities = "rero_ils.modules.entities.local_entities.mappings"
local_fields = "rero_ils.modules.local_fields.mappings"
locations = "rero_ils.modules.locations.mappings"
notifications = "rero_ils.modules.notifications.mappings"
Expand Down
Loading
0