0.0.0-rc.15

apps/Core/Components/Devtools/Modules/ModulesComponent.php

@@ -187,6 +187,7 @@ public function viewAction()
 			unset($modules['apptypes']);
 			unset($modules['bundles']);
 
+			$modifiedModules = [];
 			foreach ($modules as $moduleType => &$modulesTypeArr) {
 				if (isset($modulesTypeArr['childs']) && count($modulesTypeArr['childs']) > 0) {
 					foreach ($modulesTypeArr['childs'] as $childKey => &$child) {
@@ -195,12 +196,18 @@ public function viewAction()
 						if ($child['repoExists'] && !$child['isModified'] && $child['latestRelease']) {
 							unset($modules[$moduleType]['childs'][$childKey]);
 						}
+
+						if (isset($child['modified_files']) && count($child['modified_files']) > 0) {
+							$modifiedModules[$child['id']] = $child['modified_files'];
+						}
 					}
 				}
 			}
 
 			$this->view->modules = $modules;
 
+			$this->view->modifiedModules = $modifiedModules;
+
 			$this->view->pick('modules/changes');
 
 			return;
@@ -385,7 +392,7 @@ public function viewAction()
 
 								$module['id'] = $module['module_details']['id'];
 							} catch (\throwable $e) {
-								throw new \Exception($e->getMessage());
+								throw $e;
 							}
 						}
 					}
@@ -857,4 +864,28 @@ public function checkVersionAction()
 			$this->modulesPackage->packagesData->responseCode
 		);
 	}
+
+	public function reCalculateFilesHashAction()
+	{
+		$this->requestIsPost();
+
+		$this->modulesPackage->reCalculateFilesHash($this->postData(), false, false, false, true);
+
+		$this->addResponse(
+			$this->modulesPackage->packagesData->responseMessage,
+			$this->modulesPackage->packagesData->responseCode
+		);
+	}
+
+	public function getModifiedFilesHashAction()
+	{
+		$this->requestIsPost();
+
+		$this->modulesPackage->getModifiedFilesHash($this->postData());
+
+		$this->addResponse(
+			$this->modulesPackage->packagesData->responseMessage,
+			$this->modulesPackage->packagesData->responseCode
+		);
+	}
 }

apps/Core/Components/System/Geo/Cities/CitiesComponent.php

@@ -28,46 +28,46 @@ public function viewAction()
             if ($this->getData()['id'] != 0) {
                 $city = $this->basepackages->geoCities->getById($this->getData()['id']);
 
-                if (!$city) {
-                    return $this->throwIdNotFound();
-                }
-
                 $this->view->city = $city;
-            } else {
-                $this->view->city = [];
             }
-            $this->view->pick('cities/view');
 
-            $this->view->countries = $countriesArr;
-            $this->view->states = $statesArr;
-            return;
-        }
+            if (!$this->view->city) {
+                return $this->throwIdNotFound();
+            }
 
-        $countries = [];
-        $states = [];
+            $this->view->pick('cities/view');
 
-        if ($countriesArr) {
-            foreach ($countriesArr as $countriesKey => $country) {
-                $countries[$country['id']] = $country['name'] . ' (' . $country['id'] . ')';
-            }
-        }
+            $this->view->countries = [$countriesArr[$city['country_id']]];
+            $this->view->states = [$statesArr[$city['state_id']]];
 
-        if ($statesArr) {
-            foreach ($statesArr as $statesKey => $state) {
-                $states[$state['id']] = $state['name'] . ' (' . $state['id'] . ')';
-            }
+            return;
         }
 
         $controlActions =
             [
                 // 'includeQ'              => true,
                 'actionsToEnable'       =>
                 [
-                    'edit'      => 'system/geo/cities',
+                    'view'      => 'system/geo/cities',
                 ]
             ];
 
         if ($this->request->isPost()) {
+            $countries = [];
+            $states = [];
+
+            if ($countriesArr) {
+                foreach ($countriesArr as $countriesKey => $country) {
+                    $countries[$country['id']] = $country['name'] . ' (' . $country['id'] . ')';
+                }
+            }
+
+            if ($statesArr) {
+                foreach ($statesArr as $statesKey => $state) {
+                    $states[$state['id']] = $state['name'] . ' (' . $state['id'] . ')';
+                }
+            }
+
             $replaceColumns =
                 [
                     'country_id'  =>
@@ -141,13 +141,13 @@ public function searchCityAction()
                 return;
             }
 
-            $searchCities = $this->basepackages->geoCities->searchCities($searchQuery);
-
-            if ($searchCities) {
-                $this->view->responseCode = $this->basepackages->geoCities->packagesData->responseCode;
+            $this->basepackages->geoCities->searchCities($searchQuery);
 
-                $this->view->cities = $this->basepackages->geoCities->packagesData->cities;
-            }
+            $this->addResponse(
+                $this->basepackages->geoCities->packagesData->responseMessage,
+                $this->basepackages->geoCities->packagesData->responseCode,
+                $this->basepackages->geoCities->packagesData->responseData ?? []
+            );
         } else {
             $this->addResponse('Search Query Missing', 1);
         }
@@ -164,13 +164,13 @@ public function searchPostCodeAction()
                 return;
             }
 
-            $searchPostCodes = $this->basepackages->geoCities->searchPostCodes($searchQuery);
+            $this->basepackages->geoCities->searchPostCodes($searchQuery);
 
-            if ($searchPostCodes) {
-                $this->view->responseCode = $this->basepackages->geoCities->packagesData->responseCode;
-
-                $this->view->postCodes = $this->basepackages->geoCities->packagesData->postCodes;
-            }
+            $this->addResponse(
+                $this->basepackages->geoCities->packagesData->responseMessage,
+                $this->basepackages->geoCities->packagesData->responseCode,
+                $this->basepackages->geoCities->packagesData->responseData ?? []
+            );
         } else {
             $this->addResponse('Search Query Missing', 1);
         }

apps/Core/Components/System/Geo/Countries/CountriesComponent.php

@@ -4,7 +4,6 @@
 
 use Apps\Core\Packages\Adminltetags\Traits\DynamicTable;
 use System\Base\BaseComponent;
-use System\Base\Providers\BasepackagesServiceProvider\Packages\Geo\GeoExtractData;
 
 class CountriesComponent extends BaseComponent
 {
@@ -26,46 +25,26 @@ public function viewAction()
             if ($this->getData()['id'] != 0) {
                 $country = $this->basepackages->geoCountries->getById($this->getData()['id']);
 
-                if (!$country) {
-                    return $this->throwIdNotFound();
-                }
-
                 $this->view->country = $country;
-            } else {
-                $this->view->country = [];
             }
+
+            if (!$this->view->country) {
+                return $this->throwIdNotFound();
+            }
+
             $this->view->pick('countries/view');
 
             return;
         }
 
         $controlActions =
             [
-                // 'includeQ'              => true,
                 'actionsToEnable'       =>
                 [
                     'edit'      => 'system/geo/countries',
                 ]
             ];
 
-        // $dtAdditionControlButtons =
-        //     [
-        //         'includeId'  => true,
-        //         // 'includeQ'   => true, //Only true when not adding /q/ in link below.
-        //         'buttons'    => [
-        //             'states'    => [
-        //                 'title'     => 'states',
-        //                 'icon'      => 'map-marked',
-        //                 'link'      => $this->links->url('system/geo/q/type/states')
-        //             ],
-        //             'cities'    => [
-        //                 'title'     => 'cities',
-        //                 'icon'      => 'map-marked-alt',
-        //                 'link'      => $this->links->url('system/geo/q/type/cities')
-        //             ]
-        //         ]
-        //     ];
-
         $replaceColumns =
             [
                 'installed'  =>
@@ -97,7 +76,6 @@ public function viewAction()
             null,
             $replaceColumns,
             'name',
-            // $dtAdditionControlButtons
         );
 
         $this->view->pick('countries/list');
@@ -118,6 +96,7 @@ public function apiViewAction()
                     return $this->throwIdNotFound();
                 }
             }
+
             $this->addResponse('Ok', 0, ['data' => $geoCountry]);
 
             return;
@@ -132,29 +111,12 @@ public function apiViewAction()
                     ['name', 'capital', 'currency', 'installed', 'enabled']
                 );
 
-            if ($data) {
-                $this->addResponse('Ok', 0, ['data' => $data]);
-            }
+            $this->addResponse('Ok', 0, ['data' => $data ?? []]);
 
             return;
         }
     }
 
-    /**
-     * @acl(name=add)
-     */
-    public function addAction()
-    {
-        $this->requestIsPost();
-
-        $this->geoCountries->addCountry($this->postData());
-
-        $this->addResponse(
-            $this->geoCountries->packagesData->responseMessage,
-            $this->geoCountries->packagesData->responseCode
-        );
-    }
-
     /**
      * @acl(name=update)
      */
@@ -178,13 +140,22 @@ public function installAction()
 
         $this->addResponse(
             $this->geoCountries->packagesData->responseMessage,
-            $this->geoCountries->packagesData->responseCode
+            $this->geoCountries->packagesData->responseCode,
+            $this->geoCountries->packagesData->responseData ?? []
         );
     }
 
     public function uninstallAction()
     {
-        //
+        $this->requestIsPost();
+
+        $this->geoCountries->uninstallCountry($this->postData());
+
+        $this->addResponse(
+            $this->geoCountries->packagesData->responseMessage,
+            $this->geoCountries->packagesData->responseCode,
+            $this->geoCountries->packagesData->responseData ?? []
+        );
     }
 
     public function searchCountryAction()
@@ -198,17 +169,15 @@ public function searchCountryAction()
                 return;
             }
 
-            $searchCountries = $this->geoCountries->searchCountries($searchQuery);
+            $countries = $this->geoCountries->searchCountries($searchQuery);
 
-            if ($searchCountries) {
-                $this->view->responseCode = $this->geoCountries->packagesData->responseCode;
+            $countries = msort($countries, 'id');
 
-                $countries = $this->geoCountries->packagesData->countries;
-
-                $countries = msort($countries, 'id');
-
-                $this->view->countries = $countries;
-            }
+            $this->addResponse(
+                $this->geoCountries->packagesData->responseMessage,
+                $this->geoCountries->packagesData->responseCode,
+                ['countries' => $countries] ?? []
+            );
         } else {
             $this->addResponse('Search Query Missing', 1);
         }