!410 - Changed external type dependency to composer.

Author: oyeaussie

apps/Core/Packages/Devtools/Modules/DevtoolsModules.php

@@ -594,13 +594,23 @@ public function getDefaultDependencies($type = null)
     {
         $defaultDependencies =
             [
-                'core'              => [],
-                'apptype'           => [],
-                'components'        => [],
-                'packages'          => [],
-                'middlewares'       => [],
-                'views'             => [],
-                'external'          => []
+                'core'                      => [],
+                'apptype'                   => [],
+                'components'                => [],
+                'packages'                  => [],
+                'middlewares'               => [],
+                'views'                     => [],
+                'external'                  => [
+                    'composer'              => [
+                        'require'           => []
+                    ],
+                    'config'                => [
+                        'allow-plugins'     => []
+                    ],
+                    'extra'                 => [
+                        'patches'           => []
+                    ]
+                ]
             ];
 
         if ($type && $type === 'views') {
@@ -1586,6 +1596,7 @@ protected function initApi($data)
         }
 
         $this->apiClient = $this->basepackages->apiClientServices->useApi($data['api_id'], true);
+
         $this->apiClientConfig = $this->apiClient->getApiConfig();
 
         if ($this->apiClientConfig['auth_type'] === 'auth' &&
@@ -2425,8 +2436,6 @@ public function commitBundleJson($data)
 
                 return;
             }
-
-            throw $e;
         }
 
         $jsonContent = [];

apps/Core/Views/Default/html/devtools/modules/module.html

@@ -994,11 +994,11 @@
                         dataCollectionSectionForm['vars']['bundleModules'][label]['repo'] = moduleData['repo'];
 
                     } else if (label === 'external') {
-                        if (dataCollectionSectionForm['vars']['bundleModules']['external'].length === 0) {
-                            dataCollectionSectionForm['vars']['bundleModules']['external'] = { };
+                        if (dataCollectionSectionForm['vars']['bundleModules']['external']['composer']['require'].length === 0) {
+                            dataCollectionSectionForm['vars']['bundleModules']['external']['composer']['require'] = { };
                         }
 
-                        dataCollectionSectionForm['vars']['bundleModules'][label][$('#{{componentId}}-{{sectionId}}-modules-external').val()]
+                        dataCollectionSectionForm['vars']['bundleModules'][label]['composer']['require'][$('#{{componentId}}-{{sectionId}}-modules-external').val()]
                             = $('#{{componentId}}-{{sectionId}}-modules-external-version').val();
 
                         reset();
@@ -1041,7 +1041,7 @@
                         }
                         dataCollectionSectionForm['vars']['bundleModules'][label] = { };
                     } else if (label === 'external') {
-                        delete dataCollectionSectionForm['vars']['bundleModules'][label][$('#{{componentId}}-{{sectionId}}-modules-external').val()];
+                        delete dataCollectionSectionForm['vars']['bundleModules'][label]['composer']['require'][$('#{{componentId}}-{{sectionId}}-modules-external').val()];
                     } else {
                         for (var modules in dataCollectionSectionForm['vars']['bundleModules']) {
                             if (label === modules) {
@@ -3056,10 +3056,10 @@
                             dataCollectionSectionForm['vars']['moduleDependencies']['composer']['require'][$('#{{componentId}}-{{sectionId}}-dependencies-external').val()]
                                 = $('#{{componentId}}-{{sectionId}}-dependencies-external-version').val();
                         } else {
-                            if (dataCollectionSectionForm['vars']['moduleDependencies']['external'].length === 0) {
-                                dataCollectionSectionForm['vars']['moduleDependencies']['external'] = { };
+                            if (dataCollectionSectionForm['vars']['moduleDependencies'][label]['composer']['require'].length === 0) {
+                                dataCollectionSectionForm['vars']['moduleDependencies'][label]['composer']['require'] = { };
                             }
-                            dataCollectionSectionForm['vars']['moduleDependencies'][label][$('#{{componentId}}-{{sectionId}}-dependencies-external').val()]
+                            dataCollectionSectionForm['vars']['moduleDependencies'][label]['composer']['require'][$('#{{componentId}}-{{sectionId}}-dependencies-external').val()]
                                 = $('#{{componentId}}-{{sectionId}}-dependencies-external-version').val();
                         }
                     } else {
@@ -3120,8 +3120,8 @@
                                 delete dataCollectionSectionForm['vars']['moduleDependencies']['composer']['require'][$('#{{componentId}}-{{sectionId}}-dependencies-external').val()];
                             }
                         } else {
-                            if (dataCollectionSectionForm['vars']['moduleDependencies'][label][$('#{{componentId}}-{{sectionId}}-dependencies-external').val()]) {
-                                delete dataCollectionSectionForm['vars']['moduleDependencies'][label][$('#{{componentId}}-{{sectionId}}-dependencies-external').val()];
+                            if (dataCollectionSectionForm['vars']['moduleDependencies'][label]['composer']['require'][$('#{{componentId}}-{{sectionId}}-dependencies-external').val()]) {
+                                delete dataCollectionSectionForm['vars']['moduleDependencies'][label]['composer']['require'][$('#{{componentId}}-{{sectionId}}-dependencies-external').val()];
                             }
                         }
                     } else {

apps/Core/Views/Default/html/devtools/modules/module/dependencies.html

@@ -195,15 +195,15 @@
                                         'size'                    : 'xs',
                                         'disabled'                : true,
                                         'type'                    : 'danger',
-                                        'icon'                    : 'trash'
+                                        'icon'                    : 'trash',
+                                        'position'                : 'right'
                                     ],
                                     'dependencies-add'    : [
                                         'title'                   : 'Add',
                                         'size'                    : 'xs',
                                         'disabled'                : true,
                                         'type'                    : 'primary',
-                                        'icon'                    : 'plus',
-                                        'position'                : 'right'
+                                        'icon'                    : 'plus'
                                     ]
                                 ]
                         ]