From 6ea17c468569e476653f469ac477212008bd3c90 Mon Sep 17 00:00:00 2001 From: Blake Mason Date: Tue, 7 Nov 2023 09:52:47 -0800 Subject: [PATCH 1/6] [C] Remove PR github workflows and update README --- .github/workflows/develop-pr-gae.yaml | 123 -------------------------- .github/workflows/master-pr-gae.yaml | 88 ------------------ README.md | 14 +++ 3 files changed, 14 insertions(+), 211 deletions(-) delete mode 100644 .github/workflows/develop-pr-gae.yaml delete mode 100644 .github/workflows/master-pr-gae.yaml diff --git a/.github/workflows/develop-pr-gae.yaml b/.github/workflows/develop-pr-gae.yaml deleted file mode 100644 index 46fa5d24..00000000 --- a/.github/workflows/develop-pr-gae.yaml +++ /dev/null @@ -1,123 +0,0 @@ -name: 'PR Preview to Dev' - -on: - pull_request: - types: - - 'opened' - - 'synchronize' - - 'reopened' - - 'closed' - branches: - - 'develop' - -jobs: - build-push-deploy: - name: 'Build and Deploy PR Preview to Development' - runs-on: ubuntu-latest - if: ${{ (github.event.action != 'closed') && (startsWith(github.head_ref, 'preview') == true) }} - - # Checkout the repository to the GitHub Actions runner - steps: - - name: Checkout - uses: actions/checkout@v2 - - # gcloud CLI setup - - name: Login to GCP - uses: google-github-actions/setup-gcloud@v0 - with: - service_account_key: ${{ secrets.DEV_SA_KEY }} - project_id: skyviewer - export_default_credentials: true - - - name: Get app.yaml - run: gcloud secrets versions access latest --secret=rubin-obs-api-appyaml > app.yaml - - - name: Format version name - id: version_name - run: echo "version_name=$(echo \"${{ github.head_ref }}\" | tr -cd '[:alnum:]' | tr '[:upper:]' '[:lower:]' | tr -d 'preview')" >> $GITHUB_ENV - - - name: Deploy to App Engine - env: - BRANCH_NAME: ${{ env.version_name }} - run: | - gcloud app deploy app.yaml \ - --no-promote \ - --version=${BRANCH_NAME,,} - - # Create or update a comment with the URL - - name: Find Comment - uses: peter-evans/find-comment@v1 - id: fc - with: - issue-number: ${{ github.event.pull_request.number }} - comment-author: 'github-actions[bot]' - body-includes: A preview of this PR - - - name: Create or update a comment with the URL to the PR - uses: peter-evans/create-or-update-comment@v1 - with: - comment-id: ${{ steps.fc.outputs.comment-id }} - issue-number: ${{ github.event.pull_request.number }} - body: | - A preview of this PR will be available at https://${{ github.head_ref }}-dot-rubin-obs-api-dot-skyviewer.uw.r.appspot.com until the request is closed. :sparkles: - reactions: '+1' - edit-mode: replace - - run-e2e-tests: - name: 'Run End-to-End Tests on Preview Instance' - runs-on: ubuntu-latest - needs: build-push-deploy - if: (steps.build.outcome == 'success') && (${{ (github.event.action != 'closed') && (startsWith(github.head_ref, 'preview') == true) }}) - - # Checkout the repository to the GitHub Actions runner - steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Install Node.js/NPM - uses: actions/setup-node@v3 - with: - node-version: 16 - - # Install test suite - - name: Install Cypress dependencies - run: ls -l && pwd && yarn install --frozen-lockfile - - - name: Login to GCP - uses: google-github-actions/setup-gcloud@v0 - with: - service_account_key: ${{ secrets.DEV_SA_KEY }} - project_id: skyviewer - export_default_credentials: true - - - name: Get Cypress Secrets - run: gcloud secrets versions access latest --secret=craft-cypress-github-action-env >> cypress.env.json - - - name: Cypress run - uses: cypress-io/github-action@v5 - env: - CYPRESS_BASE_URL: http://${{ github.head_ref }}-dot-rubin-obs-api-dot-skyviewer.uw.r.appspot.com/admin - - cleanup: - name: 'Cleanup PR Preview' - runs-on: ubuntu-latest - if: ${{ (github.event.action == 'closed') && (startsWith(github.head_ref, 'preview') == true) }} - - # Checkout the repository to the GitHub Actions runner - steps: - - name: Checkout - uses: actions/checkout@v2 - - # gcloud CLI setup - - name: Login to GCP - uses: google-github-actions/setup-gcloud@v0 - with: - service_account_key: ${{ secrets.DEV_SA_KEY }} - project_id: skyviewer - export_default_credentials: true - - # Destruct! - - name: Destroy version - env: - BRANCH_NAME: ${{ env.version_name }} - run: gcloud app versions delete ${BRANCH_NAME,,} --service=rubin-obs-api diff --git a/.github/workflows/master-pr-gae.yaml b/.github/workflows/master-pr-gae.yaml deleted file mode 100644 index 066fd7c0..00000000 --- a/.github/workflows/master-pr-gae.yaml +++ /dev/null @@ -1,88 +0,0 @@ -name: 'PR Preview to Int' - -on: - pull_request: - types: - - 'opened' - - 'synchronize' - - 'reopened' - - 'closed' - branches: - - 'master' - -jobs: - build-push-deploy: - name: 'Build and Deploy PR Preview to Integration' - runs-on: ubuntu-latest - if: ${{ (github.event.action != 'closed') && (startsWith(github.head_ref, 'preview') == true) }} - - # Checkout the repository to the GitHub Actions runner - steps: - - name: Checkout - uses: actions/checkout@v2 - - # gcloud CLI setup - - name: Login to GCP - uses: google-github-actions/setup-gcloud@v0 - with: - service_account_key: ${{ secrets.SKYVIEWER_INT_SERVICE_ACCOUNT }} - project_id: edc-int-6c5e - export_default_credentials: true - - - name: Get app.yaml - run: gcloud secrets versions access latest --secret=rubin-obs-api-appyaml > app.yaml - - - name: Format version name - id: version_name - run: echo "version_name=$(echo \"${{ github.head_ref }}\" | tr -cd '[:alnum:]' | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV - - - name: Deploy to App Engine - env: - BRANCH_NAME: ${{ env.version_name }} - run: | - gcloud app deploy app.yaml \ - --no-promote \ - --version=${BRANCH_NAME,,} - - # Create or update a comment with the URL - - name: Find Comment - uses: peter-evans/find-comment@v1 - id: fc - with: - issue-number: ${{ github.event.pull_request.number }} - comment-author: 'github-actions[bot]' - body-includes: A preview of this PR - - - name: Create or update a comment with the URL to the PR - uses: peter-evans/create-or-update-comment@v1 - with: - comment-id: ${{ steps.fc.outputs.comment-id }} - issue-number: ${{ github.event.pull_request.number }} - body: | - A preview of this PR will be available at https://${{ github.head_ref }}-dot-rubin-obs-api-int-dot-edc-int-6c5e.uc.r.appspot.com/ until the request is closed. :sparkles: - reactions: '+1' - edit-mode: replace - - cleanup: - name: 'Cleanup PR Preview' - runs-on: ubuntu-latest - if: ${{ (github.event.action == 'closed') && (startsWith(github.head_ref, 'preview') == true) }} - - # Checkout the repository to the GitHub Actions runner - steps: - - name: Checkout - uses: actions/checkout@v2 - - # gcloud CLI setup - - name: Login to GCP - uses: google-github-actions/setup-gcloud@v0 - with: - service_account_key: ${{ secrets.SKYVIEWER_INT_SERVICE_ACCOUNT }} - project_id: edc-int-6c5e - export_default_credentials: true - - # Destruct! - - name: Destroy version - env: - BRANCH_NAME: ${{ env.version_name }} - run: gcloud app versions delete ${BRANCH_NAME,,} --service=rubin-obs-api \ No newline at end of file diff --git a/README.md b/README.md index 5c629e42..896dba63 100644 --- a/README.md +++ b/README.md @@ -93,3 +93,17 @@ The /api/assets folder has been added to the .gitignore file for obvious file-si A docker-compose.yml file is simply a way to define multiple images/containers that may be dependent on each other, and any environment variables that each image is expecting. When these defined containers and dependencies are brought up with the ```docker-compose up``` command each container is started as the dependencies dictate. h the ```docker-compose up``` command each container is started as the dependencies dictate. + + +#### How to create a dump of your local DB + +1. Containers need to be running, we're going to ssh into the postgres one: + * `docker container ls` + * `docker exec -it /bin/sh` +2. Create the dump file within the container: + * `pg_dump -U craft >> whatever_name_you_want.sql` +3. Retrieve & save the dump file to your local: + * Open a new terminal window + * `docker cp :/path/to/whatever_name_you_want.sql /local/path/to/whatever_name_you_want.sql` + + From 0e3ad6f90a118370fc7a529eebee2c6e605e6db8 Mon Sep 17 00:00:00 2001 From: Blake Mason Date: Wed, 15 Nov 2023 16:08:31 -0800 Subject: [PATCH 2/6] [F] Transition from AWS to GCS for asset_variants volume --- api/composer.json | 1 - api/composer.lock | 343 +--------------------------- api/config/general.php | 10 +- api/config/project/project.yaml | 24 +- docker-compose-local-db.sample.yaml | 5 - 5 files changed, 13 insertions(+), 370 deletions(-) diff --git a/api/composer.json b/api/composer.json index 3a6afe56..35de5120 100755 --- a/api/composer.json +++ b/api/composer.json @@ -2,7 +2,6 @@ "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", diff --git a/api/composer.lock b/api/composer.lock index ff6fcdc9..6c8334fc 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": "26bd6b56db3003673680ee2b394febbd", + "content-hash": "b48eb8e1e4683971433e48b531180f7c", "packages": [ { "name": "abraham/twitteroauth", @@ -50,150 +50,6 @@ ], "time": "2022-01-19T01:10:09+00:00" }, - { - "name": "aws/aws-crt-php", - "version": "v1.0.4", - "source": { - "type": "git", - "url": "https://github.com/awslabs/aws-crt-php.git", - "reference": "f5c64ee7c5fce196e2519b3d9b7138649efe032d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/awslabs/aws-crt-php/zipball/f5c64ee7c5fce196e2519b3d9b7138649efe032d", - "reference": "f5c64ee7c5fce196e2519b3d9b7138649efe032d", - "shasum": "" - }, - "require": { - "php": ">=5.5" - }, - "require-dev": { - "phpunit/phpunit": "^4.8.35|^5.6.3" - }, - "type": "library", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0" - ], - "authors": [ - { - "name": "AWS SDK Common Runtime Team", - "email": "aws-sdk-common-runtime@amazon.com" - } - ], - "description": "AWS Common Runtime for PHP", - "homepage": "http://aws.amazon.com/sdkforphp", - "keywords": [ - "amazon", - "aws", - "crt", - "sdk" - ], - "support": { - "issues": "https://github.com/awslabs/aws-crt-php/issues", - "source": "https://github.com/awslabs/aws-crt-php/tree/v1.0.4" - }, - "time": "2023-01-31T23:08:25+00:00" - }, - { - "name": "aws/aws-sdk-php", - "version": "3.261.15", - "source": { - "type": "git", - "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "7d17f3187a4d5bebc41ca5d363570ed632b698c0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/7d17f3187a4d5bebc41ca5d363570ed632b698c0", - "reference": "7d17f3187a4d5bebc41ca5d363570ed632b698c0", - "shasum": "" - }, - "require": { - "aws/aws-crt-php": "^1.0.4", - "ext-json": "*", - "ext-pcre": "*", - "ext-simplexml": "*", - "guzzlehttp/guzzle": "^6.5.8 || ^7.4.5", - "guzzlehttp/promises": "^1.4.0", - "guzzlehttp/psr7": "^1.8.5 || ^2.3", - "mtdowling/jmespath.php": "^2.6", - "php": ">=5.5" - }, - "require-dev": { - "andrewsville/php-token-reflection": "^1.4", - "aws/aws-php-sns-message-validator": "~1.0", - "behat/behat": "~3.0", - "composer/composer": "^1.10.22", - "dms/phpunit-arraysubset-asserts": "^0.4.0", - "doctrine/cache": "~1.4", - "ext-dom": "*", - "ext-openssl": "*", - "ext-pcntl": "*", - "ext-sockets": "*", - "nette/neon": "^2.3", - "paragonie/random_compat": ">= 2", - "phpunit/phpunit": "^4.8.35 || ^5.6.3 || ^9.5", - "psr/cache": "^1.0", - "psr/simple-cache": "^1.0", - "sebastian/comparator": "^1.2.3 || ^4.0", - "yoast/phpunit-polyfills": "^1.0" - }, - "suggest": { - "aws/aws-php-sns-message-validator": "To validate incoming SNS notifications", - "doctrine/cache": "To use the DoctrineCacheAdapter", - "ext-curl": "To send requests using cURL", - "ext-openssl": "Allows working with CloudFront private distributions and verifying received SNS messages", - "ext-sockets": "To use client-side monitoring" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } - }, - "autoload": { - "files": [ - "src/functions.php" - ], - "psr-4": { - "Aws\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0" - ], - "authors": [ - { - "name": "Amazon Web Services", - "homepage": "http://aws.amazon.com" - } - ], - "description": "AWS SDK for PHP - Use Amazon Web Services in your PHP project", - "homepage": "http://aws.amazon.com/sdkforphp", - "keywords": [ - "amazon", - "aws", - "cloud", - "dynamodb", - "ec2", - "glacier", - "s3", - "sdk" - ], - "support": { - "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", - "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.261.15" - }, - "time": "2023-03-20T18:19:46+00:00" - }, { "name": "carlcs/craft-assetmetadata", "version": "4.0.0", @@ -1060,70 +916,6 @@ ], "time": "2022-02-25T21:32:43+00:00" }, - { - "name": "craftcms/aws-s3", - "version": "2.0.3", - "source": { - "type": "git", - "url": "https://github.com/craftcms/aws-s3.git", - "reference": "a04ee659490d53da879e302e660ba3807532a926" - }, - "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", @@ -3626,76 +3418,6 @@ ], "time": "2023-02-18T15:32:41+00:00" }, - { - "name": "league/flysystem-aws-s3-v3", - "version": "3.12.2", - "source": { - "type": "git", - "url": "https://github.com/thephpleague/flysystem-aws-s3-v3.git", - "reference": "645e14e4a80bd2da8b01e57388e7296a695a80c2" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/645e14e4a80bd2da8b01e57388e7296a695a80c2", - "reference": "645e14e4a80bd2da8b01e57388e7296a695a80c2", - "shasum": "" - }, - "require": { - "aws/aws-sdk-php": "^3.220.0", - "league/flysystem": "^3.10.0", - "league/mime-type-detection": "^1.0.0", - "php": "^8.0.2" - }, - "conflict": { - "guzzlehttp/guzzle": "<7.0", - "guzzlehttp/ringphp": "<1.1.1" - }, - "type": "library", - "autoload": { - "psr-4": { - "League\\Flysystem\\AwsS3V3\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Frank de Jonge", - "email": "info@frankdejonge.nl" - } - ], - "description": "AWS S3 filesystem adapter for Flysystem.", - "keywords": [ - "Flysystem", - "aws", - "file", - "files", - "filesystem", - "s3", - "storage" - ], - "support": { - "issues": "https://github.com/thephpleague/flysystem-aws-s3-v3/issues", - "source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/3.12.2" - }, - "funding": [ - { - "url": "https://ecologi.com/frankdejonge", - "type": "custom" - }, - { - "url": "https://github.com/frankdejonge", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/league/flysystem", - "type": "tidelift" - } - ], - "time": "2023-01-17T14:15:08+00:00" - }, { "name": "league/flysystem-google-cloud-storage", "version": "3.12.3", @@ -4270,67 +3992,6 @@ ], "time": "2023-02-06T13:44:46+00:00" }, - { - "name": "mtdowling/jmespath.php", - "version": "2.6.1", - "source": { - "type": "git", - "url": "https://github.com/jmespath/jmespath.php.git", - "reference": "9b87907a81b87bc76d19a7fb2d61e61486ee9edb" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/9b87907a81b87bc76d19a7fb2d61e61486ee9edb", - "reference": "9b87907a81b87bc76d19a7fb2d61e61486ee9edb", - "shasum": "" - }, - "require": { - "php": "^5.4 || ^7.0 || ^8.0", - "symfony/polyfill-mbstring": "^1.17" - }, - "require-dev": { - "composer/xdebug-handler": "^1.4 || ^2.0", - "phpunit/phpunit": "^4.8.36 || ^7.5.15" - }, - "bin": [ - "bin/jp.php" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.6-dev" - } - }, - "autoload": { - "files": [ - "src/JmesPath.php" - ], - "psr-4": { - "JmesPath\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - } - ], - "description": "Declaratively specify how to extract elements from a JSON document", - "keywords": [ - "json", - "jsonpath" - ], - "support": { - "issues": "https://github.com/jmespath/jmespath.php/issues", - "source": "https://github.com/jmespath/jmespath.php/tree/2.6.1" - }, - "time": "2021-06-14T00:11:39+00:00" - }, { "name": "nystudio107/craft-plugin-vite", "version": "4.0.8", @@ -9872,5 +9533,5 @@ "platform-overrides": { "php": "8.1.10" }, - "plugin-api-version": "2.1.0" + "plugin-api-version": "2.3.0" } diff --git a/api/config/general.php b/api/config/general.php index 129d317a..f23a7d58 100755 --- a/api/config/general.php +++ b/api/config/general.php @@ -10,7 +10,6 @@ use craft\helpers\App; -$s3BucketPathFormat = 'https://s3.%s.amazonaws.com/%s/'; $gcsBucketPathFormat = 'https://storage.googleapis.com/%s/'; return [ @@ -35,11 +34,6 @@ 'aliases' => [ '@webroot' => dirname(__DIR__) . '/web', '@previewUrlFormat' => App::env('ALIAS_PREVIEW_URL_FORMAT'), - '@assetsAssetVariantBaseURL' => sprintf( - $s3BucketPathFormat, - App::env('AWS_ASSET_S3_REGION'), - App::env('AWS_ASSET_S3_BUCKET') - ), '@assetsGeneralBaseURL' => sprintf( $gcsBucketPathFormat, App::env('GCS_GENERAL_BUCKET') @@ -60,6 +54,10 @@ $gcsBucketPathFormat, App::env('GCS_STAFF_BUCKET') ), + '@assetsVariantsBaseURL' => sprintf( + $gcsBucketPathFormat, + App::env('GCS_ASSET_VARIANTS_BUCKET') + ), '@webBaseUrl' => App::env('WEB_BASE_URL') ], diff --git a/api/config/project/project.yaml b/api/config/project/project.yaml index ca052955..cc7572c4 100644 --- a/api/config/project/project.yaml +++ b/api/config/project/project.yaml @@ -1,4 +1,4 @@ -dateModified: 1694647778 +dateModified: 1700092915 email: fromEmail: $EMAIL_FROM_ADDRESS fromName: $EMAIL_SENDER_NAME @@ -18,20 +18,14 @@ fs: hasUrls: true name: 'Asset Variants' settings: - addSubfolderToRootUrl: '1' - autoFocalPoint: '' - bucket: $AWS_ASSET_S3_BUCKET + bucket: $GCS_ASSET_VARIANTS_BUCKET bucketSelectionMode: manual - cfDistributionId: '' - cfPrefix: '' expires: '' - keyId: $AWS_ASSET_KEY_ID - makeUploadsPublic: '1' - region: $AWS_ASSET_S3_REGION - secret: $AWS_ASSET_SECRET_KEY - subfolder: $AWS_ASSET_S3_ASSET_VARIANT_SUBFOLDER - type: craft\awss3\Fs - url: '@assetsAssetVariantBaseURL' + keyFileContents: '' + projectId: $GCP_PROJECT_ID + subfolder: '' + type: craft\googlecloud\Fs + url: '@assetsVariantsBaseURL' cantoDam: hasUrls: true name: 'Canto DAM' @@ -405,10 +399,6 @@ plugins: edition: standard enabled: true schemaVersion: 3.0.0 - aws-s3: - edition: standard - enabled: true - schemaVersion: '2.0' contact-form: edition: standard enabled: true diff --git a/docker-compose-local-db.sample.yaml b/docker-compose-local-db.sample.yaml index f3ee98d8..8966a9b7 100644 --- a/docker-compose-local-db.sample.yaml +++ b/docker-compose-local-db.sample.yaml @@ -47,11 +47,6 @@ services: CANTO_AUTH_ENDPOINT: https://oauth.canto.com/oauth/api/oauth2/token?app_id={appId}&app_secret={secretKey}&grant_type=client_credentials&refresh_token= CANTO_ASSET_ENDPOINT: CANTO_ASSET_BASEURL: - AWS_ASSET_KEY_ID: - AWS_ASSET_SECRET_KEY: - AWS_ASSET_S3_BUCKET: - AWS_ASSET_S3_REGION: - AWS_ASSET_S3_ASSET_VARIANT_SUBFOLDER: FACEBOOK_APP_ID: FACEBOOK_APP_SECRET: FACEBOOK_APP_REDIRECT_URL: /sso-redirect?sso=true&facebook=true From 116faf72d772af2f05fb17ad164def000857711b Mon Sep 17 00:00:00 2001 From: Blake Mason Date: Thu, 16 Nov 2023 14:47:16 -0800 Subject: [PATCH 3/6] [C] Update Canto DAM Plugin to latest --- api/composer.json | 2 +- api/composer.lock | 55 ++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 48 insertions(+), 9 deletions(-) diff --git a/api/composer.json b/api/composer.json index 35de5120..72ea001f 100755 --- a/api/composer.json +++ b/api/composer.json @@ -8,7 +8,7 @@ "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-epo/canto-dam-assets": "4.0.9", "lsst/canto-dam-integrator": "dev-EPO-7854", "rynpsc/craft-phone-number": "^2.1.0", "sebastianlenz/linkfield": "^2.1.4", diff --git a/api/composer.lock b/api/composer.lock index 6c8334fc..0258a7e5 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": "b48eb8e1e4683971433e48b531180f7c", + "content-hash": "8cc8f840d80f3a8f70fe12965d136037", "packages": [ { "name": "abraham/twitteroauth", @@ -1528,6 +1528,46 @@ }, "time": "2015-01-27T10:53:51+00:00" }, + { + "name": "daccess1/yii2-json-query-helper", + "version": "v1.0.0-stable", + "source": { + "type": "git", + "url": "https://github.com/daccess1/yii2-json-query-helper.git", + "reference": "d0308456a019ffb2b56258b70c83325e35414a88" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/daccess1/yii2-json-query-helper/zipball/d0308456a019ffb2b56258b70c83325e35414a88", + "reference": "d0308456a019ffb2b56258b70c83325e35414a88", + "shasum": "" + }, + "require": { + "yiisoft/yii2": "~2.0.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "daccess1\\JSONQueryHelper\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "b.kruchinkin", + "email": "b.kruchinkin@yandex.ru" + } + ], + "description": "Yii2 helper class, used to generate query expressions for JSON columns.", + "support": { + "issues": "https://github.com/daccess1/yii2-json-query-helper/issues", + "source": "https://github.com/daccess1/yii2-json-query-helper/tree/v1.0.0-stable" + }, + "time": "2020-12-21T20:21:29+00:00" + }, { "name": "defuse/php-encryption", "version": "v2.4.0", @@ -3633,20 +3673,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": "e711f598b29efd23363b2cb5a4101f30b0f0a903" + "reference": "23b37e676db58fc84171b78ad2f2089b90696247" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/lsst-epo/canto-dam-assets/zipball/e711f598b29efd23363b2cb5a4101f30b0f0a903", - "reference": "e711f598b29efd23363b2cb5a4101f30b0f0a903", + "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" }, @@ -3654,7 +3695,6 @@ "craftcms/ecs": "dev-main", "craftcms/phpstan": "dev-main" }, - "default-branch": true, "type": "craft-plugin", "extra": { "handle": "_canto-dam-assets", @@ -3694,7 +3734,7 @@ "issues": "https://github.com/lsst-epo/canto-dam-assets/issues", "source": "https://github.com/lsst-epo/canto-dam-assets/" }, - "time": "2023-10-10T03:01:45+00:00" + "time": "2023-11-13T23:48:10+00:00" }, { "name": "lsst/canto-dam-integrator", @@ -9523,7 +9563,6 @@ "aliases": [], "minimum-stability": "dev", "stability-flags": { - "lsst-epo/canto-dam-assets": 20, "lsst/canto-dam-integrator": 20 }, "prefer-stable": true, From 8438b1b6a6934181fbf1c1c7652bb7d817229633 Mon Sep 17 00:00:00 2001 From: Blake Mason Date: Tue, 21 Nov 2023 14:29:26 -0800 Subject: [PATCH 4/6] [F] Callouts use new DAM plugin - Removes previous DAM plugin and activates teh new one - Removes deprecated DAM asset fields Includes changes to Entry Types: - Main Callout Image - TwoTone Callout Background Image - Glossary Term Image - Investigation Hero Images --- api/composer.json | 1 - api/composer.lock | 65 +------------------ ...-942c9e60-2760-42ed-b03b-9e5eb133751b.yaml | 52 +++++++++++++-- ...-34f61e7c-358c-48b8-8439-42bc05ed255c.yaml | 43 ++++++++++-- ...-bbf936fb-1787-437b-8ebd-a6e79409896e.yaml | 31 +++++++-- ...-0b946ecb-12e3-4999-9d02-fc902cb66fdf.yaml | 9 ++- ...-4b6329ee-1231-466b-94e6-24b8f46ea9d6.yaml | 16 +++++ ...-676da0d6-dc63-48fd-a5cd-7253c956974c.yaml | 14 ---- ...-496e755e-78ab-4e3f-8c3a-9b320023b8ec.yaml | 32 --------- .../4fe339ec-7579-46f4-a362-df6ee8de4b3c.yaml | 2 +- .../77dc755a-bb96-4422-b00f-c7d74e45d400.yaml | 2 +- .../d6898b26-bfa2-41d3-9e26-0092b2021762.yaml | 2 +- api/config/project/project.yaml | 32 ++++----- ...-51d86fa7-e37a-4926-97c8-3112fd6f2fbe.yaml | 38 ----------- 14 files changed, 145 insertions(+), 194 deletions(-) create mode 100644 api/config/project/fields/cantoAssetSingle--4b6329ee-1231-466b-94e6-24b8f46ea9d6.yaml delete mode 100644 api/config/project/fields/cantoDamAsset--676da0d6-dc63-48fd-a5cd-7253c956974c.yaml delete mode 100644 api/config/project/fields/damAsset--496e755e-78ab-4e3f-8c3a-9b320023b8ec.yaml delete mode 100644 api/config/project/volumes/cantoDam--51d86fa7-e37a-4926-97c8-3112fd6f2fbe.yaml diff --git a/api/composer.json b/api/composer.json index 72ea001f..ed0d2b2a 100755 --- a/api/composer.json +++ b/api/composer.json @@ -9,7 +9,6 @@ "craftcms/redactor": "3.0.4", "jamesedmonston/graphql-authentication": "2.5.0", "lsst-epo/canto-dam-assets": "4.0.9", - "lsst/canto-dam-integrator": "dev-EPO-7854", "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 0258a7e5..6bd5d113 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": "8cc8f840d80f3a8f70fe12965d136037", + "content-hash": "60ef3417ee155e314e4721aa96f83c8d", "packages": [ { "name": "abraham/twitteroauth", @@ -3736,65 +3736,6 @@ }, "time": "2023-11-13T23:48:10+00:00" }, - { - "name": "lsst/canto-dam-integrator", - "version": "dev-EPO-7854", - "source": { - "type": "git", - "url": "https://github.com/lsst-epo/craft-canto-dam-integrator.git", - "reference": "3ddd7eb9b0f2de0fbf551ae45e14aca0e577274e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/lsst-epo/craft-canto-dam-integrator/zipball/3ddd7eb9b0f2de0fbf551ae45e14aca0e577274e", - "reference": "3ddd7eb9b0f2de0fbf551ae45e14aca0e577274e", - "shasum": "" - }, - "require": { - "craftcms/cms": "^4.0.0" - }, - "require-dev": { - "codeception/codeception": "^4.2.2", - "codeception/module-asserts": "^2.0", - "codeception/module-yii2": "^1.1", - "craftcms/rector": "dev-main", - "ext-zip": "^1.15", - "vlucas/phpdotenv": "^3.0" - }, - "type": "craft-plugin", - "extra": { - "name": "Universal DAM Integrator", - "handle": "universal-dam-integrator" - }, - "autoload": { - "psr-4": { - "rosas\\dam\\": "src/" - } - }, - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Eric Rosas", - "homepage": "https://github.com/lsst-epo/craft3-universal-dam-integrator" - } - ], - "description": "This plugin is intended to be vendor agnostic, but with enough customizability to work across a broad range of vendors.", - "keywords": [ - "asset", - "dam", - "digital", - "manager" - ], - "support": { - "email": "erosas@lsst.org", - "issues": "https://github.com/lsst-epo/craft3-universal-dam-integrator/issues", - "source": "https://github.com/lsst-epo/craft3-universal-dam-integrator", - "docs": "https://github.com/lsst-epo/craft3-universal-dam-integrator/blob/main/README.md" - }, - "time": "2023-10-03T22:20:08+00:00" - }, { "name": "mikehaertl/php-shellcommand", "version": "1.7.0", @@ -9562,9 +9503,7 @@ ], "aliases": [], "minimum-stability": "dev", - "stability-flags": { - "lsst/canto-dam-integrator": 20 - }, + "stability-flags": [], "prefer-stable": true, "prefer-lowest": false, "platform": [], diff --git a/api/config/project/entryTypes/callout--942c9e60-2760-42ed-b03b-9e5eb133751b.yaml b/api/config/project/entryTypes/callout--942c9e60-2760-42ed-b03b-9e5eb133751b.yaml index ee9ed2ca..5aa2c11e 100644 --- a/api/config/project/entryTypes/callout--942c9e60-2760-42ed-b03b-9e5eb133751b.yaml +++ b/api/config/project/entryTypes/callout--942c9e60-2760-42ed-b03b-9e5eb133751b.yaml @@ -2,6 +2,7 @@ fieldLayouts: 07a17729-4353-45e5-b214-5c8a058996a0: tabs: - + elementCondition: null elements: - autocapitalize: true @@ -9,6 +10,7 @@ fieldLayouts: autocorrect: true class: null disabled: false + elementCondition: null id: null instructions: null label: Title @@ -24,108 +26,146 @@ fieldLayouts: tip: null title: null type: craft\fieldlayoutelements\entries\EntryTitleField + uid: 8374128c-a4dd-4b43-8954-66eecf4eebf1 + userCondition: null warning: null width: 100 - + elementCondition: null fieldUid: b0ce3829-20c1-44ef-a7c7-499800645afc # Header instructions: null label: null required: false tip: null type: craft\fieldlayoutelements\CustomField + uid: 37d4c4f2-6c88-4730-b8f1-334f33abee62 + userCondition: null warning: null width: 100 - + elementCondition: null fieldUid: 7db205b7-a548-42f1-8c26-416ec51cf3fa # Text instructions: null label: null required: false tip: null type: craft\fieldlayoutelements\CustomField + uid: cd642a63-7002-441b-ae33-6af81a89f08e + userCondition: null warning: null width: 100 - - fieldUid: 496e755e-78ab-4e3f-8c3a-9b320023b8ec # Image + elementCondition: null + fieldUid: 4b6329ee-1231-466b-94e6-24b8f46ea9d6 # Single Canto Asset instructions: null label: null required: false tip: null type: craft\fieldlayoutelements\CustomField + uid: 639c7d0b-cb11-4075-b17c-794821b9fe72 + userCondition: null warning: null - width: 25 + width: 100 - + elementCondition: null fieldUid: cc3b4231-1a7c-42f3-934c-cadeb0076f8c # Image Padding instructions: null label: null required: false tip: null type: craft\fieldlayoutelements\CustomField + uid: b057c708-29fb-40d1-8ab4-9aa58ef0f296 + userCondition: null warning: null width: 25 - + elementCondition: null fieldUid: fa690eba-6d46-4a5e-9dcd-0845f5b56c1b # Dynamic Component instructions: 'In place of an image, a dynamic component can be chosen (currently only for Alert Stream)' - label: '' - required: '' + label: null + required: false tip: null type: craft\fieldlayoutelements\CustomField + uid: f85172ee-3cc8-4d7b-9cb5-b5bce49973a2 + userCondition: null warning: null width: 25 - + elementCondition: null fieldUid: 4c977b75-9ee1-4cdb-9d2a-203639f4af84 # Links instructions: null label: null required: false tip: null type: craft\fieldlayoutelements\CustomField + uid: 3055fbfd-6549-4883-91d6-9691a71dc7ba + userCondition: null warning: null width: 100 name: Content - sortOrder: 1 + uid: 319c6253-dbb1-47d9-911d-70c861008cca + userCondition: null - + elementCondition: null elements: - + elementCondition: null fieldUid: 8b8ed305-e6e6-4754-925f-bb07427b2060 # Background Color instructions: null label: null required: false tip: null type: craft\fieldlayoutelements\CustomField + uid: bd5414b2-a5e7-4249-a518-6e795cc94977 + userCondition: null warning: null width: 25 - + elementCondition: null fieldUid: 36247100-a0f8-4eb9-b190-898131bf97b3 # Width instructions: null label: null required: false tip: null type: craft\fieldlayoutelements\CustomField + uid: 7a40401c-464e-4880-98d3-11d98ff7ffb5 + userCondition: null warning: null width: 25 - + elementCondition: null fieldUid: dfd8564d-5db6-4167-99db-29867a64bc2c # Content Order instructions: null label: null required: false tip: null type: craft\fieldlayoutelements\CustomField + uid: 0faa2d0a-4669-4f36-b8cc-a345f61ef122 + userCondition: null warning: null width: 25 - + elementCondition: null fieldUid: 753b10b6-e9e6-44f5-a9d9-4a07788733e1 # Content Ratio instructions: null label: null required: false tip: null type: craft\fieldlayoutelements\CustomField + uid: fb07d073-87a1-44ad-a420-ec6c96738cf5 + userCondition: null warning: null width: 25 name: Appearance - sortOrder: 2 + uid: a8f90084-a7ee-47f3-98f6-041d58fd5bfc + userCondition: null handle: callout hasTitleField: true name: Callout section: 7cad6f4e-cc7b-45cf-ac7b-6f383e77bc1b # Callouts +showStatusField: true +slugTranslationKeyFormat: null +slugTranslationMethod: site sortOrder: 1 titleFormat: null titleTranslationKeyFormat: null diff --git a/api/config/project/entryTypes/calloutTwoTone--34f61e7c-358c-48b8-8439-42bc05ed255c.yaml b/api/config/project/entryTypes/calloutTwoTone--34f61e7c-358c-48b8-8439-42bc05ed255c.yaml index 634cfb25..900c5bc6 100644 --- a/api/config/project/entryTypes/calloutTwoTone--34f61e7c-358c-48b8-8439-42bc05ed255c.yaml +++ b/api/config/project/entryTypes/calloutTwoTone--34f61e7c-358c-48b8-8439-42bc05ed255c.yaml @@ -2,6 +2,7 @@ fieldLayouts: d4231f44-575b-44ed-8325-65698b21ee70: tabs: - + elementCondition: null elements: - autocapitalize: true @@ -9,6 +10,7 @@ fieldLayouts: autocorrect: true class: null disabled: false + elementCondition: null id: null instructions: null label: null @@ -24,81 +26,110 @@ fieldLayouts: tip: null title: null type: craft\fieldlayoutelements\entries\EntryTitleField + uid: fe5100f8-be14-42e1-9812-66a3f9e1345b + userCondition: null warning: null width: 100 - + elementCondition: null fieldUid: b0ce3829-20c1-44ef-a7c7-499800645afc # Header instructions: null label: null required: false tip: null type: craft\fieldlayoutelements\CustomField + uid: ad8ff410-f30b-4633-b3d0-e2191ccccdad + userCondition: null warning: null width: 100 - + elementCondition: null fieldUid: 7db205b7-a548-42f1-8c26-416ec51cf3fa # Text instructions: null label: null required: false tip: null type: craft\fieldlayoutelements\CustomField + uid: 621b5940-ace9-4294-8e5a-68fcbf82aa56 + userCondition: null warning: null width: 100 - + elementCondition: null fieldUid: 4c977b75-9ee1-4cdb-9d2a-203639f4af84 # Links instructions: null label: null required: false tip: null type: craft\fieldlayoutelements\CustomField + uid: 3ff650b8-db0b-48c3-8bf3-d0f7561e6a37 + userCondition: null warning: null width: 100 - + elementCondition: null fieldUid: fb052686-4537-4fe5-9ce2-ff3fd4a341a2 # Content Image instructions: null label: null required: false tip: null type: craft\fieldlayoutelements\CustomField + uid: 4d68000c-1847-4e25-adef-acae28662b58 + userCondition: null warning: null width: 100 - + elementCondition: null fieldUid: 61b9d842-7365-4bbf-883c-1b6433dc15f4 # Caption - rich text instructions: null label: null required: false tip: null type: craft\fieldlayoutelements\CustomField + uid: 1219e837-2eb4-4539-a170-43dde87354d3 + userCondition: null warning: null width: 100 name: Content - sortOrder: 1 + uid: ec5112b9-3a3e-44fe-a499-99882bd3b31b + userCondition: null - + elementCondition: null elements: - + elementCondition: null fieldUid: 8b8ed305-e6e6-4754-925f-bb07427b2060 # Background Color instructions: null label: null required: false tip: null type: craft\fieldlayoutelements\CustomField + uid: d5798468-8fe7-4309-8ede-459b3b3c9efc + userCondition: null warning: null width: 50 - - fieldUid: 496e755e-78ab-4e3f-8c3a-9b320023b8ec # Image - instructions: '' + elementCondition: null + fieldUid: 4b6329ee-1231-466b-94e6-24b8f46ea9d6 # Single Canto Asset + instructions: null label: 'Background Image' - required: '' + required: false tip: null type: craft\fieldlayoutelements\CustomField + uid: d0e819c6-1fcb-4c72-9785-957020973221 + userCondition: null warning: null - width: 50 + width: 100 name: Appearance - sortOrder: 2 + uid: 85912a77-3616-4a59-ab58-9e284bd3c0bf + userCondition: null handle: calloutTwoTone hasTitleField: true name: 'Callout - two-tone' section: 7cad6f4e-cc7b-45cf-ac7b-6f383e77bc1b # Callouts +showStatusField: true +slugTranslationKeyFormat: null +slugTranslationMethod: site sortOrder: 2 titleFormat: null titleTranslationKeyFormat: null diff --git a/api/config/project/entryTypes/glossaryTerm--bbf936fb-1787-437b-8ebd-a6e79409896e.yaml b/api/config/project/entryTypes/glossaryTerm--bbf936fb-1787-437b-8ebd-a6e79409896e.yaml index 19b1b191..cefaea8d 100644 --- a/api/config/project/entryTypes/glossaryTerm--bbf936fb-1787-437b-8ebd-a6e79409896e.yaml +++ b/api/config/project/entryTypes/glossaryTerm--bbf936fb-1787-437b-8ebd-a6e79409896e.yaml @@ -2,6 +2,7 @@ fieldLayouts: a8cd2eac-2f6d-4d2d-8c0b-bb3f624542dd: tabs: - + elementCondition: null elements: - autocapitalize: true @@ -9,8 +10,9 @@ fieldLayouts: autocorrect: true class: null disabled: false + elementCondition: null id: null - instructions: '' + instructions: null label: Term max: null min: null @@ -24,41 +26,56 @@ fieldLayouts: tip: null title: null type: craft\fieldlayoutelements\entries\EntryTitleField + uid: 61797a36-b6db-4e54-b435-9d30a9043649 + userCondition: null warning: null width: 25 - + elementCondition: null fieldUid: 7db205b7-a548-42f1-8c26-416ec51cf3fa # Text - instructions: '' + instructions: null label: Definition - required: '' + required: false tip: null type: craft\fieldlayoutelements\CustomField + uid: dcac119b-35dc-4555-a406-219f617fd5d0 + userCondition: null warning: null width: 75 - - fieldUid: 496e755e-78ab-4e3f-8c3a-9b320023b8ec # Image + elementCondition: null + fieldUid: 4b6329ee-1231-466b-94e6-24b8f46ea9d6 # Single Canto Asset instructions: null - label: null + label: Image required: false tip: null type: craft\fieldlayoutelements\CustomField + uid: ba971e2c-8b89-486c-a27e-2e56e56919c3 + userCondition: null warning: null - width: 50 + width: 100 - + elementCondition: null fieldUid: 10118ebf-e3bf-4b1b-bbb8-4b57ab3753c8 # Caption instructions: null label: null required: false tip: null type: craft\fieldlayoutelements\CustomField + uid: 6d31eb58-08cf-4344-95cb-f6f14762309b + userCondition: null warning: null width: 50 name: Content - sortOrder: 1 + uid: fb49671a-9e05-461d-8b26-435d46b1c279 + userCondition: null handle: glossaryTerm hasTitleField: true name: 'Glossary Term' section: 4ffeb743-f02d-42af-8656-a6f9c1363e79 # Glossary Terms +showStatusField: true +slugTranslationKeyFormat: null +slugTranslationMethod: site sortOrder: 1 titleFormat: null titleTranslationKeyFormat: null diff --git a/api/config/project/entryTypes/investigation--0b946ecb-12e3-4999-9d02-fc902cb66fdf.yaml b/api/config/project/entryTypes/investigation--0b946ecb-12e3-4999-9d02-fc902cb66fdf.yaml index 047786af..c6703a47 100644 --- a/api/config/project/entryTypes/investigation--0b946ecb-12e3-4999-9d02-fc902cb66fdf.yaml +++ b/api/config/project/entryTypes/investigation--0b946ecb-12e3-4999-9d02-fc902cb66fdf.yaml @@ -92,13 +92,13 @@ fieldLayouts: width: 25 - elementCondition: null - fieldUid: 496e755e-78ab-4e3f-8c3a-9b320023b8ec # Image + fieldUid: 4b6329ee-1231-466b-94e6-24b8f46ea9d6 # Single Canto Asset instructions: null - label: null + label: Image required: false tip: null type: craft\fieldlayoutelements\CustomField - uid: 990498d5-4a5b-4fdc-834a-1604b6532ab5 + uid: 6162960a-1489-401c-a8d9-5ae457fa3561 userCondition: null warning: null width: 100 @@ -109,6 +109,9 @@ handle: investigation hasTitleField: true name: Investigation section: 546e0c6d-dd32-4997-8487-cc4c2fcc9480 # Investigations +showStatusField: true +slugTranslationKeyFormat: null +slugTranslationMethod: site sortOrder: 1 titleFormat: null titleTranslationKeyFormat: null diff --git a/api/config/project/fields/cantoAssetSingle--4b6329ee-1231-466b-94e6-24b8f46ea9d6.yaml b/api/config/project/fields/cantoAssetSingle--4b6329ee-1231-466b-94e6-24b8f46ea9d6.yaml new file mode 100644 index 00000000..982bc0bf --- /dev/null +++ b/api/config/project/fields/cantoAssetSingle--4b6329ee-1231-466b-94e6-24b8f46ea9d6.yaml @@ -0,0 +1,16 @@ +columnSuffix: gvphitkg +contentColumnType: + - 'cantoId:string' + - 'cantoAlbumId:string' + - 'cantoAssetData:json' + - 'cantoAlbumData:json' +fieldGroup: 9940892d-32f4-4399-acac-ab559ce1c82b # Common +handle: cantoAssetSingle +instructions: null +name: 'Single Canto Asset' +searchable: false +settings: + cantoAssetPickerType: singleImagePicker +translationKeyFormat: null +translationMethod: site +type: lsst\cantodamassets\fields\CantoDamAsset 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/fields/damAsset--496e755e-78ab-4e3f-8c3a-9b320023b8ec.yaml b/api/config/project/fields/damAsset--496e755e-78ab-4e3f-8c3a-9b320023b8ec.yaml deleted file mode 100644 index 714ecb2d..00000000 --- a/api/config/project/fields/damAsset--496e755e-78ab-4e3f-8c3a-9b320023b8ec.yaml +++ /dev/null @@ -1,32 +0,0 @@ -columnSuffix: null -contentColumnType: string -fieldGroup: df8c8d8a-c7d1-45bf-b551-ef790a5b59ad # Callouts -handle: damAsset -instructions: '' -name: Image -searchable: true -settings: - allowSelfRelations: false - allowUploads: true - allowedKinds: null - defaultUploadLocationSource: '' - defaultUploadLocationSubpath: null - limit: '1' - localizeRelations: true - previewMode: full - restrictFiles: null - selectionLabel: '' - showSiteMenu: true - showUnpermittedFiles: false - showUnpermittedVolumes: true - singleUploadLocationSource: '' - singleUploadLocationSubpath: null - source: null - sources: '*' - targetSiteId: null - useSingleFolder: false - validateRelatedElements: false - viewMode: list -translationKeyFormat: null -translationMethod: site -type: rosas\dam\fields\DAMAsset diff --git a/api/config/project/graphql/schemas/4fe339ec-7579-46f4-a362-df6ee8de4b3c.yaml b/api/config/project/graphql/schemas/4fe339ec-7579-46f4-a362-df6ee8de4b3c.yaml index b8d55a8a..e177559f 100644 --- a/api/config/project/graphql/schemas/4fe339ec-7579-46f4-a362-df6ee8de4b3c.yaml +++ b/api/config/project/graphql/schemas/4fe339ec-7579-46f4-a362-df6ee8de4b3c.yaml @@ -43,7 +43,7 @@ scope: - 'volumes.18a75c63-648f-4145-9cc3-386e7c8a0106:read' # General - 'volumes.c3d1c243-1703-4117-abc7-88487a1f8f24:read' # Staff Profiles - 'volumes.d41cc960-99a4-41a8-a7a6-7891a22e4a93:read' # Asset Variants - - 'volumes.51d86fa7-e37a-4926-97c8-3112fd6f2fbe:read' # Canto DAM + - 'volumes.51d86fa7-e37a-4926-97c8-3112fd6f2fbe:read' - 'globalsets.1a2ba41a-3949-4982-9cb3-f8b03863bcfd:read' # Footer Content - 'globalsets.8ccd6c1c-8e9b-44e8-93a9-f62589fb4819:read' # Site Information - 'globalsets.994d5664-f056-4969-b2cc-c62660f069af:read' # Root Page Information diff --git a/api/config/project/graphql/schemas/77dc755a-bb96-4422-b00f-c7d74e45d400.yaml b/api/config/project/graphql/schemas/77dc755a-bb96-4422-b00f-c7d74e45d400.yaml index 828e5b0d..27998fa7 100644 --- a/api/config/project/graphql/schemas/77dc755a-bb96-4422-b00f-c7d74e45d400.yaml +++ b/api/config/project/graphql/schemas/77dc755a-bb96-4422-b00f-c7d74e45d400.yaml @@ -38,7 +38,7 @@ scope: - 'volumes.18a75c63-648f-4145-9cc3-386e7c8a0106:read' # General - 'volumes.c3d1c243-1703-4117-abc7-88487a1f8f24:read' # Staff Profiles - 'volumes.d41cc960-99a4-41a8-a7a6-7891a22e4a93:read' # Asset Variants - - 'volumes.51d86fa7-e37a-4926-97c8-3112fd6f2fbe:read' # Canto DAM + - 'volumes.51d86fa7-e37a-4926-97c8-3112fd6f2fbe:read' - 'globalsets.b8393df9-fb81-4d70-9ccb-6d030c818580:read' # Gallery Item Defaults - 'globalsets.994d5664-f056-4969-b2cc-c62660f069af:read' # Root Page Information - 'globalsets.8ccd6c1c-8e9b-44e8-93a9-f62589fb4819:read' # Site Information diff --git a/api/config/project/graphql/schemas/d6898b26-bfa2-41d3-9e26-0092b2021762.yaml b/api/config/project/graphql/schemas/d6898b26-bfa2-41d3-9e26-0092b2021762.yaml index 63d141b5..b41a0323 100644 --- a/api/config/project/graphql/schemas/d6898b26-bfa2-41d3-9e26-0092b2021762.yaml +++ b/api/config/project/graphql/schemas/d6898b26-bfa2-41d3-9e26-0092b2021762.yaml @@ -38,7 +38,7 @@ scope: - 'volumes.18a75c63-648f-4145-9cc3-386e7c8a0106:read' # General - 'volumes.c3d1c243-1703-4117-abc7-88487a1f8f24:read' # Staff Profiles - 'volumes.d41cc960-99a4-41a8-a7a6-7891a22e4a93:read' # Asset Variants - - 'volumes.51d86fa7-e37a-4926-97c8-3112fd6f2fbe:read' # Canto DAM + - 'volumes.51d86fa7-e37a-4926-97c8-3112fd6f2fbe:read' - 'globalsets.b8393df9-fb81-4d70-9ccb-6d030c818580:read' # Gallery Item Defaults - 'globalsets.994d5664-f056-4969-b2cc-c62660f069af:read' # Root Page Information - 'globalsets.8ccd6c1c-8e9b-44e8-93a9-f62589fb4819:read' # Site Information diff --git a/api/config/project/project.yaml b/api/config/project/project.yaml index cc7572c4..d97dbd87 100644 --- a/api/config/project/project.yaml +++ b/api/config/project/project.yaml @@ -1,4 +1,4 @@ -dateModified: 1700092915 +dateModified: 1700605589 email: fromEmail: $EMAIL_FROM_ADDRESS fromName: $EMAIL_SENDER_NAME @@ -26,13 +26,6 @@ fs: subfolder: '' type: craft\googlecloud\Fs url: '@assetsVariantsBaseURL' - cantoDam: - hasUrls: true - name: 'Canto DAM' - settings: - dummySetting: '' - type: rosas\dam\volumes\DAMVolume - url: 'https://rubin.canto.com/direct/' contentImages: hasUrls: true name: 'Content Images' @@ -116,6 +109,7 @@ meta: 4a55a5d1-655b-4e30-8466-c84b6d8558dd: 'End Time' # End Time 04a48967-eac4-449f-b164-c8ecbb7036d6: 'Search Results' # Search Results 4b94ba3d-060c-4a09-b2dc-c519a4c83709: 'Cell Content' # Cell Content + 4b6329ee-1231-466b-94e6-24b8f46ea9d6: 'Single Canto Asset' # Single Canto Asset 4c977b75-9ee1-4cdb-9d2a-203639f4af84: Links # Links 4d3b7f4d-258a-4d7b-b41e-29398e23ae3f: 'Staff Tags' # Staff Tags 4ead9327-61fc-4b46-810c-5f490c2c45ad: 'Gallery Types' # Gallery Types @@ -181,7 +175,6 @@ meta: 46d17af4-896a-4fc5-90bf-ac826090d9bc: Credit # Credit 46db7366-f372-41c2-9f6a-dc30bcd7a946: 'Callout - News' # Callout - News 48ba11bd-90a5-4239-a24c-d44d01affbcf: 'Image - quote' # Image - quote - 51d86fa7-e37a-4926-97c8-3112fd6f2fbe: 'Canto DAM' # Canto DAM 56f60368-4386-4395-92b6-31b15c7663cc: Contact # Contact 58aa24c3-97e4-43e7-a812-7374e5650180: 'Focal Point X' # Focal Point X 58efa872-9485-42e3-a1e3-a5435def5392: Educators # Educators @@ -204,7 +197,6 @@ meta: 125d214d-7831-4150-b5bc-1a100bc3149d: School # School 229f2975-93d3-4c6a-9996-dfa1de3004ef: 'Search Results' # Search Results 380c1cbe-884e-421b-9e31-1f0dfc81e15f: 'Cell Width' # Cell Width - 496e755e-78ab-4e3f-8c3a-9b320023b8ec: Image # Image 522bc2d7-fcc3-4817-a986-5c860e53351c: 'Internal Entry' # Internal Entry 522db817-08b6-4ecf-a423-4aec204ab85d: 'Content Blocks - News' # Content Blocks - News 534d275e-b6e9-4064-9965-07e804e0fcc1: 'User Profile Page' # User Profile Page @@ -214,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 @@ -395,6 +386,15 @@ meta: fcfd6cca-d4db-49ea-a864-b6582b85fbcf: 'End Date' # End Date fea30fc7-fc92-4268-961f-d514c1b903b8: 'Supporters'' Logos Alt' # Supporters' Logos Alt plugins: + _canto-dam-assets: + edition: standard + enabled: true + schemaVersion: 1.0.1 + settings: + appId: $CANTO_APP_ID + authEndpoint: $CANTO_AUTH_ENDPOINT + retrieveAssetMetadataEndpoint: $CANTO_ASSET_ENDPOINT + secretKey: $CANTO_SECRET_KEY asset-metadata: edition: standard enabled: true @@ -2357,16 +2357,6 @@ plugins: edition: standard enabled: true schemaVersion: 2.0.0 - universal-dam-integrator: - edition: standard - enabled: true - schemaVersion: 1.0.0 - settings: - appId: $CANTO_APP_ID - authEndpoint: $CANTO_AUTH_ENDPOINT - damVolume: cantoDam - retrieveAssetMetadataEndpoint: $CANTO_ASSET_ENDPOINT - secretKey: $CANTO_SECRET_KEY venveo-bulk-edit: edition: standard enabled: true diff --git a/api/config/project/volumes/cantoDam--51d86fa7-e37a-4926-97c8-3112fd6f2fbe.yaml b/api/config/project/volumes/cantoDam--51d86fa7-e37a-4926-97c8-3112fd6f2fbe.yaml deleted file mode 100644 index 80073dce..00000000 --- a/api/config/project/volumes/cantoDam--51d86fa7-e37a-4926-97c8-3112fd6f2fbe.yaml +++ /dev/null @@ -1,38 +0,0 @@ -fieldLayouts: - 811f8151-b4a8-450f-96b3-8baaee51ba1e: - tabs: - - - elements: - - - autocapitalize: true - autocomplete: false - autocorrect: true - class: null - disabled: false - id: null - instructions: null - label: null - max: null - min: null - name: null - orientation: null - placeholder: null - readonly: false - requirable: false - size: null - step: null - tip: null - title: null - type: craft\fieldlayoutelements\assets\AssetTitleField - warning: null - width: 100 - name: Content - sortOrder: 1 -fs: cantoDam -handle: cantoDam -hasUrls: true -name: 'Canto DAM' -sortOrder: 11 -titleTranslationKeyFormat: null -titleTranslationMethod: site -url: 'https://rubin.canto.com/direct/' From e129e539a092eba73f608b3876f6c2e3f086bdcd Mon Sep 17 00:00:00 2001 From: Eric Rosas Date: Wed, 29 Nov 2023 12:11:23 -0700 Subject: [PATCH 5/6] Change GCS plugin bucket names from choose to man EPO-8795 - Change GCS plugin bucket names from choose to manual --- api/config/project/project.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/api/config/project/project.yaml b/api/config/project/project.yaml index d97dbd87..9d5b5753 100644 --- a/api/config/project/project.yaml +++ b/api/config/project/project.yaml @@ -1,4 +1,4 @@ -dateModified: 1700605589 +dateModified: 1701284966 email: fromEmail: $EMAIL_FROM_ADDRESS fromName: $EMAIL_SENDER_NAME @@ -30,8 +30,8 @@ fs: hasUrls: true name: 'Content Images' settings: - bucket: rubin-obs-api_assets_content - bucketSelectionMode: choose + bucket: $GCS_CONTENT_BUCKET + bucketSelectionMode: manual expires: '5 minutes' keyFileContents: '' projectId: $GCP_PROJECT_ID @@ -42,8 +42,8 @@ fs: hasUrls: true name: General settings: - bucket: rubin-obs-api_assets_general - bucketSelectionMode: choose + bucket: $GCS_GENERAL_BUCKET + bucketSelectionMode: manual expires: '5 minutes' keyFileContents: '' projectId: $GCP_PROJECT_ID @@ -54,8 +54,8 @@ fs: hasUrls: true name: Heroes settings: - bucket: rubin-obs-api_assets_heroes - bucketSelectionMode: choose + bucket: $GCS_HEROES_BUCKET + bucketSelectionMode: manual expires: '5 minutes' keyFileContents: '' projectId: $GCP_PROJECT_ID @@ -66,8 +66,8 @@ fs: hasUrls: true name: 'Staff Profiles' settings: - bucket: rubin-obs-api_assets_staff_profiles - bucketSelectionMode: choose + bucket: $GCS_STAFF_BUCKET + bucketSelectionMode: manual expires: '5 minutes' keyFileContents: '' projectId: $GCP_PROJECT_ID From 43f1c0fa6da1b6c08db92baeeda41d06d3b48120 Mon Sep 17 00:00:00 2001 From: ericdrosas87 <43484316+ericdrosas87@users.noreply.github.com> Date: Wed, 29 Nov 2023 18:14:06 -0700 Subject: [PATCH 6/6] Quick release test --- api/config/project/project.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/api/config/project/project.yaml b/api/config/project/project.yaml index 9d5b5753..1a6c27f2 100644 --- a/api/config/project/project.yaml +++ b/api/config/project/project.yaml @@ -2163,9 +2163,6 @@ plugins: - - assetVariants - '' - - - - cantoDam - - '' - - group-11 - @@ -2232,9 +2229,6 @@ plugins: - - assetVariants - '' - - - - cantoDam - - '' invalidEmailAddress: 'Invalid email address' invalidHeader: 'Invalid Authorization Header' invalidJwtSecretKey: 'Invalid JWT Secret Key'