diff --git a/api/composer.json b/api/composer.json index d935a3a3..d93de4eb 100755 --- a/api/composer.json +++ b/api/composer.json @@ -2,15 +2,13 @@ "require": { "carlcs/craft-assetmetadata": "^4.0", "castiron/next-builds": "^1.0", - "craftcms/aws-s3": "2.0.3", "craftcms/cms": "4.5.4", "craftcms/contact-form": "3.0.1", "craftcms/contact-form-honeypot": "^2.0.0", "craftcms/google-cloud": "^2.0.0", "craftcms/redactor": "3.0.4", "jamesedmonston/graphql-authentication": "2.5.0", - "lsst-epo/canto-dam-assets": "dev-develop-v4", - "lsst/canto-dam-integrator": "dev-EPO-7854#v0.3.2", + "lsst-epo/canto-dam-assets": "4.0.9", "rynpsc/craft-phone-number": "^2.1.0", "sebastianlenz/linkfield": "^2.1.4", "spicyweb/craft-neo": "3.8.6", diff --git a/api/composer.lock b/api/composer.lock index 6dfd2b9f..d47fff38 100644 --- 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": "57c9a98b188d83a3af382978e7ff8634", + "content-hash": "60ef3417ee155e314e4721aa96f83c8d", "packages": [ { "name": "abraham/twitteroauth", @@ -775,70 +775,6 @@ ], "time": "2022-02-25T21:32:43+00:00" }, - { - "name": "craftcms/cms", - "version": "4.5.4", - "source": { - "type": "git", - "url": "https://github.com/craftcms/cms.git", - "reference": "bf4756f4079d883852ce50343e4d9668558dfb1c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/craftcms/aws-s3/zipball/a04ee659490d53da879e302e660ba3807532a926", - "reference": "a04ee659490d53da879e302e660ba3807532a926", - "shasum": "" - }, - "require": { - "craftcms/cms": "^4.0.0-beta.1", - "craftcms/flysystem": "^1.0.0-beta.2", - "league/flysystem-aws-s3-v3": "^3.0.0", - "php": "^8.0.2" - }, - "require-dev": { - "craftcms/ecs": "dev-main", - "craftcms/phpstan": "dev-main", - "craftcms/rector": "dev-main" - }, - "type": "craft-plugin", - "extra": { - "name": "Amazon S3", - "handle": "aws-s3", - "documentationUrl": "https://github.com/craftcms/aws-s3/blob/master/README.md" - }, - "autoload": { - "psr-4": { - "craft\\awss3\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Pixel & Tonic", - "homepage": "https://pixelandtonic.com/" - } - ], - "description": "Amazon S3 integration for Craft CMS", - "keywords": [ - "Flysystem", - "aws", - "cms", - "craftcms", - "s3", - "yii2" - ], - "support": { - "docs": "https://github.com/craftcms/aws-s3/blob/master/README.md", - "email": "support@craftcms.com", - "issues": "https://github.com/craftcms/aws-s3/issues?state=open", - "rss": "https://github.com/craftcms/aws-s3/commits/master.atom", - "source": "https://github.com/craftcms/aws-s3" - }, - "time": "2023-03-16T22:49:16+00:00" - }, { "name": "craftcms/cms", "version": "4.5.4", @@ -3489,20 +3425,21 @@ }, { "name": "lsst-epo/canto-dam-assets", - "version": "dev-develop-v4", + "version": "4.0.9", "source": { "type": "git", "url": "https://github.com/lsst-epo/canto-dam-assets.git", - "reference": "a7351e63f1b5ab1937ca79c0f59a66c9848f0d84" + "reference": "23b37e676db58fc84171b78ad2f2089b90696247" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/lsst-epo/canto-dam-assets/zipball/a7351e63f1b5ab1937ca79c0f59a66c9848f0d84", - "reference": "a7351e63f1b5ab1937ca79c0f59a66c9848f0d84", + "url": "https://api.github.com/repos/lsst-epo/canto-dam-assets/zipball/23b37e676db58fc84171b78ad2f2089b90696247", + "reference": "23b37e676db58fc84171b78ad2f2089b90696247", "shasum": "" }, "require": { "craftcms/cms": "^4.4.0", + "daccess1/yii2-json-query-helper": "^1.0.0", "nystudio107/craft-plugin-vite": "^4.0.0", "php": ">=8.0.2" }, @@ -3510,7 +3447,6 @@ "craftcms/ecs": "dev-main", "craftcms/phpstan": "dev-main" }, - "default-branch": true, "type": "craft-plugin", "extra": { "handle": "_canto-dam-assets", @@ -3894,58 +3830,6 @@ ], "time": "2023-01-25T21:09:10+00:00" }, - { - "name": "nystudio107/craft-plugin-vite", - "version": "4.0.8", - "source": { - "type": "git", - "url": "https://github.com/nystudio107/craft-plugin-vite.git", - "reference": "eb05b1cc7dc9eeecbdfe8cd3cd3d119e83c62619" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/nystudio107/craft-plugin-vite/zipball/eb05b1cc7dc9eeecbdfe8cd3cd3d119e83c62619", - "reference": "eb05b1cc7dc9eeecbdfe8cd3cd3d119e83c62619", - "shasum": "" - }, - "require": { - "craftcms/cms": "^4.0.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "nystudio107\\pluginvite\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "nystudio107", - "homepage": "https://nystudio107.com" - } - ], - "description": "Plugin Vite is the conduit between Craft CMS plugins and Vite, with manifest.json & HMR support", - "keywords": [ - "craftcms", - "plugin", - "vite" - ], - "support": { - "docs": "https://github.com/nystudio107/craft-plugin-vite/blob/v1/README.md", - "issues": "https://github.com/nystudio107/craft-plugin-vite/issues", - "source": "https://github.com/nystudio107/craft-plugin-vite/tree/4.0.8" - }, - "funding": [ - { - "url": "https://github.com/khalwat", - "type": "github" - } - ], - "time": "2023-01-25T21:09:10+00:00" - }, { "name": "paragonie/constant_time_encoding", "version": "v2.6.3", @@ -8956,10 +8840,7 @@ ], "aliases": [], "minimum-stability": "dev", - "stability-flags": { - "lsst-epo/canto-dam-assets": 20, - "lsst/canto-dam-integrator": 20 - }, + "stability-flags": [], "prefer-stable": true, "prefer-lowest": false, "platform": [], @@ -8967,5 +8848,5 @@ "platform-overrides": { "php": "8.1.10" }, - "plugin-api-version": "2.2.0" + "plugin-api-version": "2.3.0" } diff --git a/api/config/project/fields/cantoDamAsset--676da0d6-dc63-48fd-a5cd-7253c956974c.yaml b/api/config/project/fields/cantoDamAsset--676da0d6-dc63-48fd-a5cd-7253c956974c.yaml deleted file mode 100644 index a0322c2d..00000000 --- a/api/config/project/fields/cantoDamAsset--676da0d6-dc63-48fd-a5cd-7253c956974c.yaml +++ /dev/null @@ -1,14 +0,0 @@ -columnSuffix: vwsjafwg -contentColumnType: - - 'cantoId:string' - - 'cantoAlbumId:string' - - 'cantoAssetData:text' - - 'cantoAlbumData:string' -fieldGroup: df8c8d8a-c7d1-45bf-b551-ef790a5b59ad # Callouts -handle: cantoDamAsset -instructions: null -name: 'Canto DAM Asset' -searchable: false -translationKeyFormat: null -translationMethod: none -type: lsst\cantodamassets\fields\CantoDamAsset diff --git a/api/config/project/project.yaml b/api/config/project/project.yaml index 4b59249e..1a6c27f2 100644 --- a/api/config/project/project.yaml +++ b/api/config/project/project.yaml @@ -1,4 +1,4 @@ -dateModified: 1694646040 +dateModified: 1701284966 email: fromEmail: $EMAIL_FROM_ADDRESS fromName: $EMAIL_SENDER_NAME @@ -206,7 +206,6 @@ meta: 635a4a93-f10b-4d3c-bd44-2ea1474ad4cb: 'Vertical Alignment' # Vertical Alignment 644c6b87-ac0c-4cdf-88be-744a5ee684bb: Description # Description 657b9edd-b6d3-4b7f-af89-36117c5d98a8: 'Rich Text Description' # Rich Text Description - 676da0d6-dc63-48fd-a5cd-7253c956974c: 'Canto DAM Asset' # Canto DAM Asset 753b10b6-e9e6-44f5-a9d9-4a07788733e1: 'Content Ratio' # Content Ratio 824d9ca2-e755-4e41-8f6a-18e573fec8e4: 'News Posts' # News Posts 831db889-442e-4553-9076-fc3bc2843c8c: 'Hide title' # Hide title