From 60bae3613932c157f0afb3322584a5c2dc3b9c01 Mon Sep 17 00:00:00 2001
From: Eric Rosas <ericdrosas@gmail.com>
Date: Wed, 27 Sep 2023 16:05:53 -0600
Subject: [PATCH 1/3] Override runQueueAutomatically default value EPO-8521
 Override runQueueAutomatically default value for supervisord

---
 api/config/general.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/api/config/general.php b/api/config/general.php
index e98df902..129d317a 100755
--- a/api/config/general.php
+++ b/api/config/general.php
@@ -16,6 +16,10 @@
 return [
     // Global settings
     '*' => [
+        // Disable automatic running of queue jobs upon page loads in CP, which causes queue jobs to fail
+        // Supervisord now handles running queue jobs
+        'runQueueAutomatically' => false,
+
         // Default Week Start Day (0 = Sunday, 1 = Monday...)
         'defaultWeekStartDay' => 1,
 

From 3cdeaf9d393040eb42eb9b4b787ced67a974d139 Mon Sep 17 00:00:00 2001
From: Blake Mason <bmason@lsst.org>
Date: Tue, 3 Oct 2023 16:18:09 -0700
Subject: [PATCH 2/3] [C] lsst/canto-dam-integrator version bump

---
 api/composer.json |  4 ++--
 api/composer.lock | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/api/composer.json b/api/composer.json
index 8b16e835..3a6afe56 100755
--- a/api/composer.json
+++ b/api/composer.json
@@ -10,7 +10,7 @@
         "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/canto-dam-integrator": "dev-EPO-7854",
         "rynpsc/craft-phone-number": "^2.1.0",
         "sebastianlenz/linkfield": "^2.1.4",
         "spicyweb/craft-neo": "3.8.6",
@@ -65,4 +65,4 @@
     },
     "minimum-stability": "dev",
     "prefer-stable": true
-}
\ No newline at end of file
+}
diff --git a/api/composer.lock b/api/composer.lock
index b733e07d..ab5c3717 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": "26bd6b56db3003673680ee2b394febbd",
     "packages": [
         {
             "name": "abraham/twitteroauth",
@@ -3976,13 +3976,13 @@
             "version": "dev-EPO-7854",
             "source": {
                 "type": "git",
-                "url": "https://github.com/lsst-epo/craft3-universal-dam-integrator.git",
-                "reference": "4714d8aaaa6112e69ecfc39e7efc3c1eeee72243"
+                "url": "https://github.com/lsst-epo/craft-canto-dam-integrator.git",
+                "reference": "3ddd7eb9b0f2de0fbf551ae45e14aca0e577274e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/lsst-epo/craft3-universal-dam-integrator/zipball/4714d8aaaa6112e69ecfc39e7efc3c1eeee72243",
-                "reference": "4714d8aaaa6112e69ecfc39e7efc3c1eeee72243",
+                "url": "https://api.github.com/repos/lsst-epo/craft-canto-dam-integrator/zipball/3ddd7eb9b0f2de0fbf551ae45e14aca0e577274e",
+                "reference": "3ddd7eb9b0f2de0fbf551ae45e14aca0e577274e",
                 "shasum": ""
             },
             "require": {
@@ -4028,7 +4028,7 @@
                 "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-03-30T21:03:03+00:00"
+            "time": "2023-10-03T22:20:08+00:00"
         },
         {
             "name": "mikehaertl/php-shellcommand",

From 300aa469e87798e3e47b25ef6498f215ec1ce283 Mon Sep 17 00:00:00 2001
From: Eric Rosas <ericdrosas@gmail.com>
Date: Thu, 12 Oct 2023 11:04:59 -0600
Subject: [PATCH 3/3] Updated new DAM plugin EPO-8576

---
 api/composer.lock | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/api/composer.lock b/api/composer.lock
index ab5c3717..ff6fcdc9 100644
--- a/api/composer.lock
+++ b/api/composer.lock
@@ -3915,12 +3915,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/lsst-epo/canto-dam-assets.git",
-                "reference": "a7351e63f1b5ab1937ca79c0f59a66c9848f0d84"
+                "reference": "e711f598b29efd23363b2cb5a4101f30b0f0a903"
             },
             "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/e711f598b29efd23363b2cb5a4101f30b0f0a903",
+                "reference": "e711f598b29efd23363b2cb5a4101f30b0f0a903",
                 "shasum": ""
             },
             "require": {
@@ -3957,6 +3957,9 @@
                     "phpstan --memory-limit=1G"
                 ]
             },
+            "license": [
+                "MIT"
+            ],
             "authors": [
                 {
                     "name": "nystudio107",
@@ -3969,7 +3972,7 @@
                 "issues": "https://github.com/lsst-epo/canto-dam-assets/issues",
                 "source": "https://github.com/lsst-epo/canto-dam-assets/"
             },
-            "time": "2023-08-16T14:57:28+00:00"
+            "time": "2023-10-10T03:01:45+00:00"
         },
         {
             "name": "lsst/canto-dam-integrator",
@@ -9869,5 +9872,5 @@
     "platform-overrides": {
         "php": "8.1.10"
     },
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.1.0"
 }