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

SML Markup rendering #1

Draft
wants to merge 44 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
126fe57
Add markup extraction to getBody call
gfaudriga Feb 2, 2024
92f13e3
Add markup rendering and action buttons
gfaudriga Feb 2, 2024
e63fd3b
Add comment for recipe button
gfaudriga Feb 5, 2024
86c67ae
Add config option for extraction library
gfaudriga Feb 5, 2024
fdad20c
Add Markup library selection to frontend
gfaudriga Feb 5, 2024
615abba
Add call to backend for live uri update
gfaudriga Feb 5, 2024
4b721da
Encode liveUri before passing to backend
gfaudriga Feb 9, 2024
36e7b5c
fix(deps): Add html2jsonld-php dependency
gfaudriga Mar 20, 2024
e0ee1ae
Add SchemaService to MessageControllerTest
gfaudriga Mar 21, 2024
cebf448
fixup! Add SchemaService to MessageControllerTest
gfaudriga Mar 21, 2024
4a30725
fixup! fixup! Add SchemaService to MessageControllerTest
gfaudriga Mar 21, 2024
8dc56f5
fix(deps): Add jsonld2html-cards dependency
gfaudriga Mar 21, 2024
b1e9a7d
Add initial Schema Test Class
gfaudriga Mar 22, 2024
9195aca
fixup! Add initial Schema Test Class
gfaudriga Mar 22, 2024
955b6b8
Run npm lint on code changes
gfaudriga Mar 25, 2024
87632bd
Fix eslint errors
gfaudriga Mar 25, 2024
8d3622a
Move extraction library choice to admin settings
gfaudriga Mar 25, 2024
a92ecdb
Add check for isntalled apps
gfaudriga Mar 26, 2024
b3e651b
Fix issue with test
gfaudriga Mar 26, 2024
1b68d0b
Fix incorrect array access
gfaudriga Mar 26, 2024
e331744
Add Extraction Library choice to admin settings
gfaudriga Mar 28, 2024
854a3cf
Add comment for schema field hijacking/decomposition
gfaudriga Mar 28, 2024
cc9e402
Replace Google Maps with OpenStreetMap
gfaudriga Mar 28, 2024
a0094b6
Improve documentation for admin setting
gfaudriga Apr 2, 2024
fb8d4e2
Check config when getting itineraries
gfaudriga Apr 3, 2024
c889418
Adapt to changes in jsonld2html
gfaudriga Apr 5, 2024
d093d38
Fix CSS styling
gfaudriga Apr 8, 2024
af5296b
Fix Psalm issue
gfaudriga Apr 8, 2024
ff18431
Fix wrong object access in action bar
gfaudriga Apr 8, 2024
891fe55
Improve itinerary button styling
gfaudriga Apr 8, 2024
bd7f7c9
Use LD2H for both itineraries and schema
gfaudriga Apr 8, 2024
09e74f8
fixup! Use LD2H for both itineraries and schema
gfaudriga Apr 8, 2024
97dbdc0
Combine itineraries and schema calls in getBody call
gfaudriga Apr 9, 2024
395b5cd
fixup! Combine itineraries and schema calls in getBody call
gfaudriga Apr 9, 2024
32cdb76
Fix psalm issue
gfaudriga Apr 9, 2024
76a177c
fixup! Fix psalm issue
gfaudriga Apr 9, 2024
014896f
Cleanup code
gfaudriga Apr 12, 2024
97d453c
Fix modification error by cloning json property
gfaudriga Apr 12, 2024
40c711c
Fix issue with arrays in Kitinerary
gfaudriga Apr 12, 2024
fd4ad84
Fix eslint issue
gfaudriga Apr 12, 2024
9eb8852
Disable LD2H button rendering
jaudriga Apr 22, 2024
3c7b41c
WIP: Use bleeding-edge version of LD2H
jaudriga Apr 22, 2024
ec0c51c
fixup! fix(deps): Add html2jsonld-php dependency
jaudriga Apr 22, 2024
9c2d746
Only add schema var if there is content
jaudriga Apr 22, 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
11 changes: 11 additions & 0 deletions appinfo/routes.php
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,7 @@
'verb' => 'GET'
],
[
// TODO: If removing this ajax call is ok, remove this route.
'name' => 'messages#getItineraries',
'url' => '/api/messages/{id}/itineraries',
'verb' => 'GET'
Expand Down Expand Up @@ -350,6 +351,11 @@
'url' => '/api/settings/llm',
'verb' => 'PUT'
],
[
'name' => 'settings#setMarkupExtractionLibrary',
'url' => '/api/settings/markuplibrary',
'verb' => 'PUT'
],
[
'name' => 'trusted_senders#setTrusted',
'url' => '/api/trustedsenders/{email}',
Expand Down Expand Up @@ -475,6 +481,11 @@
'url' => '/api/out-of-office/{accountId}/follow-system',
'verb' => 'POST',
],
[
'name' => 'messages#updateSchemaContent',
'url' => '/api/messages/updateSchema/{url}',
'verb' => 'GET'
],
],
'resources' => [
'accounts' => ['url' => '/api/accounts'],
Expand Down
7 changes: 7 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"php": ">=8.0 <=8.3",
"ext-openssl": "*",
"arthurhoaro/favicon": "^2.0.0",
"audriga/html2jsonld-php": ">=1.x-dev",
"bamarni/composer-bin-plugin": "^1.8.2",
"bytestream/horde-exception": "^2.2.0",
"bytestream/horde-imap-client": "^2.33.1",
Expand Down Expand Up @@ -76,6 +77,12 @@
"test:unit": "phpunit -c tests/phpunit.unit.xml --fail-on-warning",
"test:unit:dev": "phpunit -c tests/phpunit.unit.xml --no-coverage --order-by=defects --stop-on-defect --fail-on-warning --stop-on-error --stop-on-failure"
},
"repositories": {
"h2ld": {
"type": "vcs",
"url": "[email protected]:audriga/html2jsonld-php.git"
}
},
"extra": {
"mozart": {
"dep_namespace": "OCA\\Mail\\Vendor\\",
Expand Down
Loading
Loading