Use default quantity type in QuickQuantityTrait.

This removes the dependency on farm_quantity_standard.

modules/core/quick/farm_quick.info.yml

@@ -6,5 +6,6 @@ core_version_requirement: ^9
 dependencies:
   - drupal:taxonomy
   - farm:asset
-  - farm:farm_quantity_standard
+  - farm:farm_log_quantity
+  - farm:quantity
   - log:log

modules/core/quick/src/Traits/QuickLogTrait.php

@@ -52,7 +52,7 @@ trait QuickLogTrait {
 
         // If the quantity is an array of values, pass it to createQuantity.
         if (is_array($qty)) {
-          $log->quantity[] = $this->createQuantity($qty);
+          $log->quantity[] = $this->createQuantity($qty, $log->bundle());
         }
 
         // Otherwise, add it directly to the log.

modules/core/quick/src/Traits/QuickQuantityTrait.php

@@ -18,20 +18,24 @@ trait QuickQuantityTrait {
    *
    * @param array $values
    *   An array of values to initialize the quantity with.
+   * @param string|null $log_type
+   *   Optionally specify the log type this quantity will be added to. This is
+   *   used to automatically determine what the default quantity type of the
+   *   log should be.
    *
    * @return \Drupal\quantity\Entity\QuantityInterface
    *   The quantity entity that was created.
    */
-  protected function createQuantity(array $values = []) {
+  protected function createQuantity(array $values = [], ?string $log_type = NULL) {
 
     // Trim the quantity label to 255 characters.
     if (!empty($values['label'])) {
       $values['label'] = $this->trimString($values['label'], 255);
     }
 
-    // If a type isn't set, default to "standard".
+    // If a type isn't set, get the default type.
     if (empty($values['type'])) {
-      $values['type'] = 'standard';
+      $values['type'] = farm_log_quantity_default_type($log_type);
     }
 
     // Split value into numerator and denominator, if it isn't already.

modules/core/quick/tests/modules/farm_quick_test/config/install/log.type.test.yml

@@ -6,3 +6,6 @@ description: ''
 name_pattern: 'Test log [log:id]'
 workflow: log_default
 new_revision: true
+third_party_settings:
+  farm_log_quantity:
+    default_quantity_type: test

modules/core/quick/tests/modules/farm_quick_test/config/install/quantity.type.test.yml

@@ -0,0 +1,11 @@
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - farm_quick_test
+id: test
+label: Test
+default_measure: ''
+description: 'Test quantity type.'
+new_revision: true

modules/core/quick/tests/modules/farm_quick_test/config/install/quantity.type.test2.yml

@@ -0,0 +1,11 @@
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - farm_quick_test
+id: test2
+label: Test2
+default_measure: ''
+description: 'Test2 quantity type.'
+new_revision: true

modules/core/quick/tests/modules/farm_quick_test/src/Plugin/QuickForm/Test.php

@@ -76,6 +76,7 @@ class Test extends QuickFormBase {
       'value' => $value,
       'units' => 'tests',
       'label' => $this->t('test label'),
+      'type' => 'test2',
     ]);
 
     // Create a term.

modules/core/quick/tests/src/Kernel/QuickFormTest.php

@@ -24,7 +24,9 @@ class QuickFormTest extends KernelTestBase {
    */
   protected static $modules = [
     'asset',
-    'farm_quantity_standard',
+    'entity_reference_revisions',
+    'farm_field',
+    'farm_log_quantity',
     'farm_quick',
     'farm_quick_test',
     'farm_unit',
@@ -102,8 +104,12 @@ class QuickFormTest extends KernelTestBase {
     // Confirm that the log is linked to the quick form.
     $this->assertEquals('test', $storage['logs'][0]->quick[0]);
 
-    // Confirm that a quantity was created.
+    // Confirm that the log's quantity type is test.
+    $this->assertEquals('test', $storage['logs'][0]->get('quantity')->referencedEntities()[0]->bundle());
+
+    // Confirm that a quantity was created and its type is test2.
     $this->assertNotEmpty($storage['quantities'][0]->id());
+    $this->assertEquals('test2', $storage['quantities'][0]->bundle());
 
     // Confirm that three terms were created or loaded.
     $this->assertEquals(3, count($storage['terms']));