-
Notifications
You must be signed in to change notification settings - Fork 393
GetThis feature + Regex config file support #4359
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
Open
rominail
wants to merge
120
commits into
vufind-org:dev
Choose a base branch
from
MSU-Libraries:getThis
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 4 commits
Commits
Show all changes
120 commits
Select commit
Hold shift + click to select a range
bdce517
GetThis feature + Regex config file support
rominail 1b89dd4
Fix pipelines
rominail 3b5fb9b
Add JS comments
rominail ba88f07
Fix pipelines
rominail dba5a5c
Change comments, change placeholder format, simplify translation text…
rominail c6fd9e4
JSDoc warnings fix, more comments in Regex.yaml, typos, git add missi…
rominail d2c5470
Typo
rominail 9b0f68c
Typo
rominail e116fe2
Comment clarification
rominail 30528e5
Text edit
rominail e597e54
Text edit
rominail fdf7218
Comment clarification
rominail 8792d22
Formatting
rominail 91d4ed0
Fix in logic
rominail b5aee38
Comment clarification, change semantic for supportsGetThis function, …
rominail 87c8b83
Merge remote-tracking branch 'msu/getThis' into getThis
rominail 64bbd7f
Prefix regex name, add operator as a key to the logical `and` in Rege…
rominail 874e2f0
Comment edit
rominail 9eb5fe3
Remove message from templates in GetThis config, add templates order …
rominail b2ce08e
Merge and fix conflicts
rominail 04b761e
Comments edit, correct implementation of supportGetThis on ILS driver…
rominail a3c3896
Add PHPDoc
rominail 90b4d44
Remove useless import
rominail 1c0cee2
Discussion changes - Translator inject into GetThis, translation, com…
rominail b92641d
Fix conflicts
rominail 0d7925a
pipelines fixes
rominail 2f2949e
pipelines fixes
rominail 61ae846
Add missing escaping
rominail e063f40
Change text for config
rominail 6f016eb
Change text to simpler version
rominail 4e6ed84
Change the logic to check for get this compatibility
rominail 6291ecc
Merge branch 'dev' of https://github.com/vufind-org/vufind into getThis
rominail 496fffa
Fix pipelines
rominail 541f5de
Fix pipelines
rominail 638e2b7
Fix conflicts
rominail e14d231
Tests, minor modifications, clean, refacto, bug fixes
rominail 1841d7b
Merge remote-tracking branch 'refs/remotes/origin/dev' into getThis
rominail b6b7c5b
Regex tests, PHPDoc
rominail f8885b5
Fix pipelines
rominail 38ecbf2
Add Demo driver config parameter not to generate random holdings, fix…
rominail a64d58e
Merge remote-tracking branch 'origin/dev' into getThis
rominail aaa6e3e
Fix css conflicts
rominail c7384b7
Fix pipelines
rominail 64312e4
Fix pipelines
rominail 1e4b78e
Fix pipelines
rominail 8e74096
Merge remote-tracking branch 'origin/dev' into getThis
rominail 23b4623
Fix bugs after catch up with dev
rominail 68084a5
Discussion changes
rominail 921420e
Fix unit tests
rominail 07673c7
Merge remote-tracking branch 'origin/dev' into getThis
rominail d6f174a
Removing var_dump
rominail cabec94
Removing var_dump
rominail e665bec
Fix pipelines
rominail 4ce8d95
Better comments in config files, use of OpenUrl instead, fix phpdoc
rominail 246476c
Fix JS check
rominail 0c7c002
Merge remote-tracking branch 'origin/dev' into getThis
rominail eb43691
Fix CSS conflicts
rominail 34ec415
Switch logger to psr instead of laminas, switch config to array inste…
rominail 4368658
Add missing JS doc
rominail 68e0f91
Fix JS indentation
rominail d986afb
Remove construct override in tests
rominail ff4a53d
Fix Rector pipeline
rominail 50e3a0e
Update config/vufind/config.ini
rominail f77b6c1
Update config/vufind/Demo.ini
rominail ee520fe
Implement suggestions, generateRandomHoldings, move getThis service l…
rominail eda9956
Pass the service locator as a reference
rominail 73b537b
Discussion changes - Move GetThiosLoader creation
rominail 2a13eff
Merge remote-tracking branch 'origin/dev' into getThis
rominail 6fd6b7c
Fix phpcs
rominail 3eea9dd
Compiled css
rominail c7eb0f8
Fix phpcs
rominail 6bedd1e
Fix phpcs
rominail d81dfc6
Fix pipelines
rominail ef009cc
Fix pipelines
rominail 4679c58
Fix pipelines
rominail ce41594
Remove "alternative" word, closure to get getThisLoader
rominail 08d8255
Fix pipelines
rominail f3a2f14
Fix pipelines
rominail c63950d
Fix pipelines
rominail 588a142
Update config/vufind/GetThis.yaml
rominail ba2a6de
Update config/vufind/GetThis.yaml
rominail f9eeb03
Update themes/bootstrap5/templates/record/get-this.phtml
rominail 9937c0f
Update config/vufind/GetThis.yaml
rominail 1430703
Update themes/bootstrap5/templates/RecordTab/holdingsils/standard.phtml
rominail 7d6bac8
Merge remote-tracking branch 'origin/dev' into getThis
rominail 5a57cab
Update themes/bootstrap5/templates/RecordTab/holdingsils/standard.phtml
rominail 648f561
Merge remote-tracking branch 'msu/getThis' into getThis
rominail c9eab47
Fix rector, discussion changes
rominail 76b721d
Rollback minor change
rominail 41a2149
Fix missing phpdoc
rominail 5361423
Fix missing phpdoc
rominail 1ecc756
Merge branch 'dev' into getThis
demiankatz 0507949
Remove left over of useless code
rominail 55b7e92
Merge remote-tracking branch 'msu/getThis' into getThis
rominail 4002fbb
Merge remote-tracking branch 'origin/dev' into getThis
rominail 64d3457
Fix bug
rominail 55c7e82
Discussion changes
rominail 189e789
Fix pipelines
rominail 9c15cad
Fix pipelines
rominail b696f5a
Fix pipelines
rominail 2190aca
Fix pipelines
rominail 12ca389
Fix pipelines
rominail 7b21ec4
Fix pipelines
rominail d988f81
Discussion changes
rominail 51be8cc
Merge remote-tracking branch 'origin/dev' into getThis
rominail 869d0a5
Fix pipelines
rominail 0b58957
Fix pipelines
rominail 8bedadc
Merge remote-tracking branch 'origin/dev' into getThis
rominail 2b6c820
Fix rector
rominail 65c94b2
Merge remote-tracking branch 'origin/dev' into getThis
rominail 28314ce
Merge remote-tracking branch 'refs/remotes/origin/dev' into getThis
rominail 17e555a
Merge remote-tracking branch 'origin/dev' into getThis
rominail e2d12c1
Implement translation in views instead of in module, fix conflicts
rominail aa26e3d
Php-cs-fixer
rominail 9260de1
Php-cs-fixer
rominail 7ff6462
Php-cs-fixer
rominail 2e56214
Refactoring of JS code to be more generic and consistent with other J…
rominail a07dde9
Discussion changes
rominail 36921a2
Merge remote-tracking branch 'origin/dev' into getThis
rominail ed3b481
Fix eslint
rominail File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| --- | ||
| # This file contains the settings for the GetThis feature | ||
|
|
||
| # Either to display the copy number (next to the call number), default false | ||
| showCopyNumber: true | ||
|
|
||
| # The order changes the order it's displayed | ||
| #template_name_within_get-this: | ||
| # enabled: true/false | ||
| # condition_function: my_function_within_GetThisLoader (optional / can be a list), the function can be negated with leading "!" | ||
| # view_variables: | ||
| # - my_var: Value | ||
| # - my_link_with_placeholder: https://mylib.edu/{{location}}/open_hours # Placeholder can be used | ||
|
rominail marked this conversation as resolved.
Outdated
|
||
| # If the function does not exist, the condition will evaluate to false | ||
| # Exemple of nested conditions | ||
|
rominail marked this conversation as resolved.
Outdated
|
||
| # holdings: | ||
| # conditions: | ||
| # - conditions: | ||
| # - conditions: | ||
| # - condition_function: showHoldings | ||
| # - and | ||
| # - condition_function: and_other_function | ||
| # - condition_function: showHoldings | ||
| # - conditions: | ||
| # - condition_function: showHoldings | ||
| # - condition_function: or_other_function | ||
| # - condition_function: showHoldings | ||
| templates: | ||
| holdings: | ||
| condition_function: showHoldings | ||
|
|
||
| biblio-info: | ||
| enabled: true | ||
|
|
||
| micro-form: | ||
| condition_function: showMicroForm | ||
| view_variables: | ||
| open_hours: https://your_lib.edu/hours | ||
|
|
||
| message: | ||
| condition_function: showMessage | ||
|
|
||
| staff-office-delivery: | ||
| condition_function: showStaffDelivery | ||
| view_variables: | ||
| general_link: https://your_lib.msu.edu/facstaffdelivery | ||
|
rominail marked this conversation as resolved.
Outdated
|
||
| request_link: https://interlib.your_lib.edu/request_link/{{title}}?author={{author}}&rft.isbn={{isbn}}&loc={{location}}&callno={{callNum}}&CAT=1 | ||
|
|
||
|
|
||
| inter-library: | ||
| condition_function: showInterLibrary | ||
| view_variables: | ||
| general_link: https://your_lib.edu/ils/ | ||
| request_link: https://interlib.your_lib.edu/request_link/{{title}}?author={{author}}&rft.isbn={{isbn}}&loc={{location}}&callno={{callNum}}&CAT=1 | ||
|
|
||
|
|
||
| remote-delivery: | ||
| condition_function: showRemotePatron | ||
| view_variables: | ||
| general_link: https://your_lib.edu/ils/distance | ||
| request_link: https://interlib.your_lib.edu/request_link/{{title}}?author={{author}}&rft.isbn={{isbn}}&loc={{location}}&callno={{callNum}}&CAT=1 | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| --- | ||
| # This file contains the settings for the Regex feature | ||
|
|
||
| # Status | ||
| AVAILABLE: | ||
| - '/^AVAILABLE/i' | ||
| - '/ITEM IN LIBRARY/i' | ||
| LIB_USE_ONLY: | ||
| - '/RESTRICTED/i' | ||
| OUT: | ||
| - '/CHECKED/i' | ||
| - '/BILLED/i' | ||
| - '/ON SEARCH/i' | ||
| - '/LOST/i' | ||
| - '/HOLD/i' | ||
| - '/AWAITING PICKUP/i' | ||
| - '/AWAITING DELIVERY/i' | ||
| - '/IN TRANSIT/i' | ||
| - '/PAGES/i' | ||
| UNAVAILABLE: | ||
| - '/AGED TO LOST/i' | ||
| - '/CLAIMED RETURNED/i' | ||
| - '/DECLARED LOST/i' | ||
| - '/IN PROCESS/i' | ||
| - '/IN PROCESS (NON-REQUESTABLE)/i' | ||
| - '/LONG MISSING/i' | ||
| - '/LOST AND PAID/i' | ||
| - '/MISSING/i' | ||
| - '/ON ORDER/i' | ||
| - '/ORDER CLOSED/i' | ||
| - '/UNKNOWN/i' | ||
| - '/WITHDRAWN/i' | ||
|
|
||
| # Description / Call Number | ||
| AV_MEDIA: | ||
| - '/DISC/i' | ||
| - '/VIDEO/i' | ||
| - '/CD/i' | ||
| - '/DVD/i' | ||
| - '/BLU-RAY/i' | ||
| - '/VINYL/i' | ||
| - '/AUDIOCASSETTE/i' | ||
|
|
||
| # Location | ||
| EXCLUSIVE: | ||
| # - CAMPUS | ||
|
rominail marked this conversation as resolved.
|
||
| MICROFORMS: | ||
| - '/MICROFORMS/i' | ||
| ONLINE: | ||
| - '/ONLINE RESOURCE/i' | ||
| - '/ELECTRONIC RESOURCES/i' | ||
| - '/INTERNET/i' | ||
|
|
||
| # Format | ||
| SERIAL: | ||
| - '/SERIAL/i' | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.