diff --git a/api/composer.json b/api/composer.json index 72ed0cd..f25c546 100755 --- a/api/composer.json +++ b/api/composer.json @@ -4,7 +4,7 @@ "craftcms/cms": "4.5.6.1", "craftcms/redactor": "3.0.4", "jamesedmonston/graphql-authentication": "2.5.0", - "lsst-epo/canto-dam-assets": "4.0.11", + "lsst-epo/canto-dam-assets": "4.0.12", "sebastianlenz/linkfield": "^2.1.4", "spicyweb/craft-neo": "3.9.5", "verbb/super-table": "^3.0", diff --git a/api/composer.lock b/api/composer.lock index 7bd4280..5cdeccc 100755 --- a/api/composer.lock +++ b/api/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "29b572e7d89f5f1279db24523cdebfa6", + "content-hash": "91d7762fb68b4df43404ecbefb8ff211", "packages": [ { "name": "abraham/twitteroauth", @@ -2084,16 +2084,16 @@ }, { "name": "lsst-epo/canto-dam-assets", - "version": "4.0.11", + "version": "4.0.12", "source": { "type": "git", "url": "https://github.com/lsst-epo/canto-dam-assets.git", - "reference": "363d270b3fa6439aa06c8a99f530a3ce648eeafd" + "reference": "6b953210872f65faf1471dd2aa273a4668624755" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/lsst-epo/canto-dam-assets/zipball/363d270b3fa6439aa06c8a99f530a3ce648eeafd", - "reference": "363d270b3fa6439aa06c8a99f530a3ce648eeafd", + "url": "https://api.github.com/repos/lsst-epo/canto-dam-assets/zipball/6b953210872f65faf1471dd2aa273a4668624755", + "reference": "6b953210872f65faf1471dd2aa273a4668624755", "shasum": "" }, "require": { @@ -2145,7 +2145,7 @@ "issues": "https://github.com/lsst-epo/canto-dam-assets/issues", "source": "https://github.com/lsst-epo/canto-dam-assets/" }, - "time": "2023-12-27T22:40:03+00:00" + "time": "2024-01-16T18:32:00+00:00" }, { "name": "mikehaertl/php-shellcommand", @@ -6275,5 +6275,5 @@ "platform-overrides": { "php": "8.1.10" }, - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } diff --git a/api/config/project/fields/video--118a3e01-4188-4f83-be5b-f4ce24d7513e.yaml b/api/config/project/fields/video--118a3e01-4188-4f83-be5b-f4ce24d7513e.yaml new file mode 100644 index 0000000..8a2fe44 --- /dev/null +++ b/api/config/project/fields/video--118a3e01-4188-4f83-be5b-f4ce24d7513e.yaml @@ -0,0 +1,16 @@ +columnSuffix: dktdixss +contentColumnType: + - 'cantoId:string' + - 'cantoAlbumId:string' + - 'cantoAssetData:json' + - 'cantoAlbumData:json' +fieldGroup: 5599d188-862e-4717-b206-6aadd975c937 # Common +handle: video +instructions: null +name: Video +searchable: false +settings: + cantoAssetPickerType: singleImagePicker +translationKeyFormat: null +translationMethod: site +type: lsst\cantodamassets\fields\CantoDamAsset diff --git a/api/config/project/neoBlockTypeGroups/513634e9-3389-4e41-b769-9433ac34e35e.yaml b/api/config/project/neoBlockTypeGroups/513634e9-3389-4e41-b769-9433ac34e35e.yaml index d17306b..b4d231e 100644 --- a/api/config/project/neoBlockTypeGroups/513634e9-3389-4e41-b769-9433ac34e35e.yaml +++ b/api/config/project/neoBlockTypeGroups/513634e9-3389-4e41-b769-9433ac34e35e.yaml @@ -1,4 +1,4 @@ alwaysShowDropdown: null field: a46e7379-7773-4ce4-9c59-434567870f0c # Content Blocks name: Widgets -sortOrder: 12 +sortOrder: 13 diff --git a/api/config/project/neoBlockTypeGroups/7ebe493b-5e03-48c8-8375-c9f9582da77e.yaml b/api/config/project/neoBlockTypeGroups/7ebe493b-5e03-48c8-8375-c9f9582da77e.yaml index 69d878c..bc9bf3b 100644 --- a/api/config/project/neoBlockTypeGroups/7ebe493b-5e03-48c8-8375-c9f9582da77e.yaml +++ b/api/config/project/neoBlockTypeGroups/7ebe493b-5e03-48c8-8375-c9f9582da77e.yaml @@ -1,4 +1,4 @@ alwaysShowDropdown: null field: a46e7379-7773-4ce4-9c59-434567870f0c # Content Blocks name: Containers -sortOrder: 7 +sortOrder: 8 diff --git a/api/config/project/neoBlockTypes/barGraphTool--a47f94c7-0a32-43be-863a-fa9d6636fff2.yaml b/api/config/project/neoBlockTypes/barGraphTool--a47f94c7-0a32-43be-863a-fa9d6636fff2.yaml index e657837..3bfa2a2 100644 --- a/api/config/project/neoBlockTypes/barGraphTool--a47f94c7-0a32-43be-863a-fa9d6636fff2.yaml +++ b/api/config/project/neoBlockTypes/barGraphTool--a47f94c7-0a32-43be-863a-fa9d6636fff2.yaml @@ -96,5 +96,5 @@ minBlocks: 0 minChildBlocks: 0 minSiblingBlocks: 0 name: 'Bar Graph Tool' -sortOrder: 14 +sortOrder: 15 topLevel: true diff --git a/api/config/project/neoBlockTypes/cameraFilterTool--87fc48a5-a399-4ce1-a7ca-2dadfd1e1445.yaml b/api/config/project/neoBlockTypes/cameraFilterTool--87fc48a5-a399-4ce1-a7ca-2dadfd1e1445.yaml index c1d7901..4a3c716 100644 --- a/api/config/project/neoBlockTypes/cameraFilterTool--87fc48a5-a399-4ce1-a7ca-2dadfd1e1445.yaml +++ b/api/config/project/neoBlockTypes/cameraFilterTool--87fc48a5-a399-4ce1-a7ca-2dadfd1e1445.yaml @@ -15,5 +15,5 @@ minBlocks: 0 minChildBlocks: 0 minSiblingBlocks: 0 name: 'Camera Filter Tool' -sortOrder: 16 +sortOrder: 17 topLevel: true diff --git a/api/config/project/neoBlockTypes/colLeft--947400f5-3c2d-403a-b94e-68715e48a9c0.yaml b/api/config/project/neoBlockTypes/colLeft--947400f5-3c2d-403a-b94e-68715e48a9c0.yaml index d21ffd7..13763d0 100644 --- a/api/config/project/neoBlockTypes/colLeft--947400f5-3c2d-403a-b94e-68715e48a9c0.yaml +++ b/api/config/project/neoBlockTypes/colLeft--947400f5-3c2d-403a-b94e-68715e48a9c0.yaml @@ -27,5 +27,5 @@ minBlocks: 0 minChildBlocks: 0 minSiblingBlocks: 0 name: 'Left Column' -sortOrder: 10 +sortOrder: 11 topLevel: false diff --git a/api/config/project/neoBlockTypes/colRight--efbf1b30-4cb7-4361-9f45-016d119aec06.yaml b/api/config/project/neoBlockTypes/colRight--efbf1b30-4cb7-4361-9f45-016d119aec06.yaml index 28ea7d3..80287f6 100644 --- a/api/config/project/neoBlockTypes/colRight--efbf1b30-4cb7-4361-9f45-016d119aec06.yaml +++ b/api/config/project/neoBlockTypes/colRight--efbf1b30-4cb7-4361-9f45-016d119aec06.yaml @@ -27,5 +27,5 @@ minBlocks: 0 minChildBlocks: 0 minSiblingBlocks: 0 name: 'Right Column' -sortOrder: 11 +sortOrder: 12 topLevel: false diff --git a/api/config/project/neoBlockTypes/colorFilterToolBlock--0d06751e-ecf9-4281-a754-8c818fb9353b.yaml b/api/config/project/neoBlockTypes/colorFilterToolBlock--0d06751e-ecf9-4281-a754-8c818fb9353b.yaml index 6476c56..7145ec2 100644 --- a/api/config/project/neoBlockTypes/colorFilterToolBlock--0d06751e-ecf9-4281-a754-8c818fb9353b.yaml +++ b/api/config/project/neoBlockTypes/colorFilterToolBlock--0d06751e-ecf9-4281-a754-8c818fb9353b.yaml @@ -44,5 +44,5 @@ minBlocks: 0 minChildBlocks: 0 minSiblingBlocks: 0 name: 'Color Filter Tool Block' -sortOrder: 17 +sortOrder: 18 topLevel: true diff --git a/api/config/project/neoBlockTypes/filterTool--3912a1a0-e71b-44b3-bcf4-976c0564975e.yaml b/api/config/project/neoBlockTypes/filterTool--3912a1a0-e71b-44b3-bcf4-976c0564975e.yaml index 18270e8..a6fbc6e 100644 --- a/api/config/project/neoBlockTypes/filterTool--3912a1a0-e71b-44b3-bcf4-976c0564975e.yaml +++ b/api/config/project/neoBlockTypes/filterTool--3912a1a0-e71b-44b3-bcf4-976c0564975e.yaml @@ -48,5 +48,5 @@ minBlocks: 0 minChildBlocks: 0 minSiblingBlocks: 0 name: 'Filter Tool' -sortOrder: 13 +sortOrder: 14 topLevel: true diff --git a/api/config/project/neoBlockTypes/group--ba6494d9-36e8-40ee-9284-c56783357043.yaml b/api/config/project/neoBlockTypes/group--ba6494d9-36e8-40ee-9284-c56783357043.yaml index 3a22ff9..5bbd931 100644 --- a/api/config/project/neoBlockTypes/group--ba6494d9-36e8-40ee-9284-c56783357043.yaml +++ b/api/config/project/neoBlockTypes/group--ba6494d9-36e8-40ee-9284-c56783357043.yaml @@ -26,5 +26,5 @@ minBlocks: 0 minChildBlocks: 0 minSiblingBlocks: 0 name: 'Interaction Group' -sortOrder: 8 +sortOrder: 9 topLevel: true diff --git a/api/config/project/neoBlockTypes/image--59560b67-c194-46fc-9404-cb790a44800a.yaml b/api/config/project/neoBlockTypes/image--59560b67-c194-46fc-9404-cb790a44800a.yaml index ee0aca1..06e5e3f 100644 --- a/api/config/project/neoBlockTypes/image--59560b67-c194-46fc-9404-cb790a44800a.yaml +++ b/api/config/project/neoBlockTypes/image--59560b67-c194-46fc-9404-cb790a44800a.yaml @@ -4,7 +4,7 @@ description: '' enabled: true field: a46e7379-7773-4ce4-9c59-434567870f0c # Content Blocks fieldLayouts: - 96eaf4d6-1491-4b97-8e8e-1c3d878a0bf8: + cc49b4bd-9177-4095-8408-f93c719e3db7: tabs: - elementCondition: null diff --git a/api/config/project/neoBlockTypes/scatterplotTool--5b8a79d6-e9d6-44d2-b986-36bf0bf74131.yaml b/api/config/project/neoBlockTypes/scatterplotTool--5b8a79d6-e9d6-44d2-b986-36bf0bf74131.yaml index 7914677..9666840 100644 --- a/api/config/project/neoBlockTypes/scatterplotTool--5b8a79d6-e9d6-44d2-b986-36bf0bf74131.yaml +++ b/api/config/project/neoBlockTypes/scatterplotTool--5b8a79d6-e9d6-44d2-b986-36bf0bf74131.yaml @@ -96,5 +96,5 @@ minBlocks: 0 minChildBlocks: 0 minSiblingBlocks: 0 name: 'Scatterplot Tool' -sortOrder: 15 +sortOrder: 16 topLevel: true diff --git a/api/config/project/neoBlockTypes/twoColumnContainer--1ed0caa3-b91f-442b-b313-f3eb54a8a0dc.yaml b/api/config/project/neoBlockTypes/twoColumnContainer--1ed0caa3-b91f-442b-b313-f3eb54a8a0dc.yaml index 57ad95a..658fa43 100644 --- a/api/config/project/neoBlockTypes/twoColumnContainer--1ed0caa3-b91f-442b-b313-f3eb54a8a0dc.yaml +++ b/api/config/project/neoBlockTypes/twoColumnContainer--1ed0caa3-b91f-442b-b313-f3eb54a8a0dc.yaml @@ -17,5 +17,5 @@ minBlocks: 0 minChildBlocks: 0 minSiblingBlocks: 0 name: 'Two Column Container' -sortOrder: 9 +sortOrder: 10 topLevel: true diff --git a/api/config/project/neoBlockTypes/video--d27f27b6-dfb4-4c6a-9196-ab3c81785d87.yaml b/api/config/project/neoBlockTypes/video--d27f27b6-dfb4-4c6a-9196-ab3c81785d87.yaml new file mode 100644 index 0000000..c7a34dc --- /dev/null +++ b/api/config/project/neoBlockTypes/video--d27f27b6-dfb4-4c6a-9196-ab3c81785d87.yaml @@ -0,0 +1,52 @@ +childBlocks: null +conditions: null +description: '' +enabled: true +field: a46e7379-7773-4ce4-9c59-434567870f0c # Content Blocks +fieldLayouts: + 84881e5b-481f-4739-bc8e-635abbde5d80: + tabs: + - + elementCondition: null + elements: + - + elementCondition: null + fieldUid: 118a3e01-4188-4f83-be5b-f4ce24d7513e # Video + instructions: null + label: null + required: true + tip: null + type: craft\fieldlayoutelements\CustomField + uid: 15384192-7122-41b6-b22f-ede33ad5be64 + userCondition: null + warning: null + width: 100 + - + elementCondition: null + fieldUid: bad8a706-ea60-4282-b1da-3c9ee5f2111a # Caption + instructions: 'Caption that will override any text fields in Canto' + label: null + required: false + tip: null + type: craft\fieldlayoutelements\CustomField + uid: c620d1af-c204-470d-bcf3-5164242224fb + userCondition: null + warning: null + width: 100 + name: 'Tab 1' + uid: 320531a7-9075-4282-91b3-c245e887568a + userCondition: null +group: null +groupChildBlockTypes: true +handle: video +icon: null +ignorePermissions: true +maxBlocks: 0 +maxChildBlocks: 0 +maxSiblingBlocks: 0 +minBlocks: 0 +minChildBlocks: 0 +minSiblingBlocks: 0 +name: Video +sortOrder: 7 +topLevel: true diff --git a/api/config/project/project.yaml b/api/config/project/project.yaml index e3aed43..9d0265d 100644 --- a/api/config/project/project.yaml +++ b/api/config/project/project.yaml @@ -1,4 +1,4 @@ -dateModified: 1704834070 +dateModified: 1705437865 elementSources: craft\elements\Entry: - @@ -133,6 +133,7 @@ meta: 77f02908-0342-4917-9d14-38f769d15c39: Pages # Pages 87fc48a5-a399-4ce1-a7ca-2dadfd1e1445: 'Camera Filter Tool' # Camera Filter Tool 90aa9610-a9c9-4531-95f8-d0068046ae25: 'Sort Options' # Sort Options + 118a3e01-4188-4f83-be5b-f4ce24d7513e: Video # Video 131ceffb-300f-415d-8cd5-a932d7529287: 'Read Only' # Read Only 222de7cf-741d-4d1f-b274-acc85a3c454c: 'Link To' # Link To 356c97b0-54e5-44bb-901e-9d92a314134f: FR # FR @@ -211,6 +212,7 @@ meta: d8be03ce-7aeb-4141-b40e-ec39ec1c796f: Educators # Educators d8ed7ca8-514f-4a3e-8675-c5a6e8d6c4f5: Min # Min d9df041c-3556-450e-94e1-f37369daf5f3: 'X-axis Label' # X-axis Label + d27f27b6-dfb4-4c6a-9196-ab3c81785d87: Video # Video dc1c3484-f028-4653-982b-a84e287d4c61: Equation # Equation dd3a1151-8de9-46f6-995f-c721fa29a07b: Option # Option dd4f7c39-ff32-47e4-b4eb-129bbf44b4a7: 'RTE Caption' # RTE Caption @@ -237,8 +239,9 @@ plugins: settings: appId: $CANTO_APP_ID authEndpoint: $CANTO_AUTH_ENDPOINT - retrieveAssetMetadataEndpoint: $CANTO_ASSET_ENDPOINT secretKey: $CANTO_SECRET_KEY + tenantHostName: rubin.canto.com + webhookSecureToken: '' graphql-authentication: edition: standard enabled: true