From 64013eaa70f05e56f0c37d5131ede7c29b57d4d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Agust=C3=ADn=20Busso?= <90727999+agustinbusso@users.noreply.github.com> Date: Tue, 28 Nov 2023 09:14:53 -0300 Subject: [PATCH 1/2] Fix global search component load --- resources/js/app-layout.js | 7 +++++++ resources/js/bootstrap.js | 2 -- resources/views/layouts/navbar.blade.php | 4 +++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/resources/js/app-layout.js b/resources/js/app-layout.js index 32cedea6db..508b5cc6ad 100644 --- a/resources/js/app-layout.js +++ b/resources/js/app-layout.js @@ -99,6 +99,13 @@ window.ProcessMaker.navbar = new Vue({ MessageModal, NavbarProfile, newRequestModal, + GlobalSearch: (resolve) => { + if (window.ProcessMaker.globalSearchComponent) { + resolve(window.ProcessMaker.globalSearchComponent); + } else { + window.ProcessMaker.globalSearchComponentResolve = resolve; + } + }, }, data() { return { diff --git a/resources/js/bootstrap.js b/resources/js/bootstrap.js index 8692dee8cf..530482cca5 100644 --- a/resources/js/bootstrap.js +++ b/resources/js/bootstrap.js @@ -25,7 +25,6 @@ import RequestChannel from "./tasks/components/ProcessRequestChannel"; import Modal from "./components/shared/Modal"; import AccessibilityMixin from "./components/common/mixins/accessibility"; import PmqlInput from "./components/shared/PmqlInput.vue"; -import GlobalSearch from "../../vendor/processmaker/package-ai/resources/js/ai/search/components/GlobalSearch.vue"; import DataTreeToggle from "./components/common/data-tree-toggle.vue"; import TreeView from "./components/TreeView.vue"; @@ -86,7 +85,6 @@ window.Vue.component("monaco-editor", MonacoEditor); window.Vue.component("screen-select", ScreenSelect); window.Vue.component("pm-modal", Modal); window.Vue.component("pmql-input", PmqlInput); -window.Vue.component("global-search", GlobalSearch); window.Vue.component("data-tree-toggle", DataTreeToggle); window.Vue.component("tree-view", TreeView); let translationsLoaded = false; diff --git a/resources/views/layouts/navbar.blade.php b/resources/views/layouts/navbar.blade.php index 8b0179108f..109a28ad17 100644 --- a/resources/views/layouts/navbar.blade.php +++ b/resources/views/layouts/navbar.blade.php @@ -9,7 +9,9 @@
- + @if(hasPackage('package-ai')) + + @endif
From 2befb68b68856792251ac11c12f139723a6c47af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Agust=C3=ADn=20Busso?= <90727999+agustinbusso@users.noreply.github.com> Date: Wed, 29 Nov 2023 14:03:50 -0300 Subject: [PATCH 2/2] Format fix --- ProcessMaker/Events/CommentsUpdated.php | 2 ++ .../Http/Controllers/Api/ScriptExecutorController.php | 2 +- ProcessMaker/Http/Controllers/HomeController.php | 1 + .../Http/Controllers/ProcessesCatalogueController.php | 5 +++-- ProcessMaker/ImportExport/Exporters/TemplateExporter.php | 1 + ProcessMaker/LicensedPackageManifest.php | 1 + ProcessMaker/Models/Permission.php | 5 +++-- ProcessMaker/Nayra/Managers/WorkflowManagerRabbitMq.php | 1 + ProcessMaker/Notifications/ProcessTranslationReady.php | 3 ++- ProcessMaker/Policies/ProcessPolicy.php | 2 +- 10 files changed, 16 insertions(+), 7 deletions(-) diff --git a/ProcessMaker/Events/CommentsUpdated.php b/ProcessMaker/Events/CommentsUpdated.php index ee86d8a39d..7ef1850c7c 100644 --- a/ProcessMaker/Events/CommentsUpdated.php +++ b/ProcessMaker/Events/CommentsUpdated.php @@ -13,6 +13,7 @@ class CommentsUpdated implements ShouldBroadcastNow use Dispatchable; use InteractsWithSockets; use SerializesModels; + public $users; /** @@ -34,6 +35,7 @@ public function broadcastOn() foreach ($this->users as $user) { $channels[] = new PrivateChannel("ProcessMaker.Models.User.{$user->id}"); } + return $channels; } diff --git a/ProcessMaker/Http/Controllers/Api/ScriptExecutorController.php b/ProcessMaker/Http/Controllers/Api/ScriptExecutorController.php index 0dd9c2529f..e625ac01d8 100644 --- a/ProcessMaker/Http/Controllers/Api/ScriptExecutorController.php +++ b/ProcessMaker/Http/Controllers/Api/ScriptExecutorController.php @@ -347,7 +347,7 @@ public function availableLanguages() { $languages = []; foreach (Script::scriptFormats() as $key => $config) { - if (!array_key_exists( 'system', $config) || (array_key_exists( 'system', $config) && !$config['system'])) { + if (!array_key_exists('system', $config) || (array_key_exists('system', $config) && !$config['system'])) { $languages[] = [ 'value' => $key, 'text' => $config['name'], diff --git a/ProcessMaker/Http/Controllers/HomeController.php b/ProcessMaker/Http/Controllers/HomeController.php index 02b48877f8..b789b4eb26 100644 --- a/ProcessMaker/Http/Controllers/HomeController.php +++ b/ProcessMaker/Http/Controllers/HomeController.php @@ -26,6 +26,7 @@ public function index(Request $request) return redirect($homePage); } + // Redirect to the default view return redirect('/requests'); } diff --git a/ProcessMaker/Http/Controllers/ProcessesCatalogueController.php b/ProcessMaker/Http/Controllers/ProcessesCatalogueController.php index a17e35eb57..c7f30e0dc0 100644 --- a/ProcessMaker/Http/Controllers/ProcessesCatalogueController.php +++ b/ProcessMaker/Http/Controllers/ProcessesCatalogueController.php @@ -13,17 +13,18 @@ public function index(Request $request) { return view('processes-catalogue.index'); } + /** * @param Process $process * @param string $id - * + * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View */ public function open(Process $process, $id) { return view('processes-catalogue.open', [ 'process' => $process, - 'processId' => $id + 'processId' => $id, ]); } } diff --git a/ProcessMaker/ImportExport/Exporters/TemplateExporter.php b/ProcessMaker/ImportExport/Exporters/TemplateExporter.php index cd13842d00..7a8e19447f 100644 --- a/ProcessMaker/ImportExport/Exporters/TemplateExporter.php +++ b/ProcessMaker/ImportExport/Exporters/TemplateExporter.php @@ -29,6 +29,7 @@ public function import() : bool } $this->model->setProcessCategoryIdAttribute($this->model->process_category_id); $this->model->save(); + return true; } } diff --git a/ProcessMaker/LicensedPackageManifest.php b/ProcessMaker/LicensedPackageManifest.php index 09795b81d5..eb07c64278 100644 --- a/ProcessMaker/LicensedPackageManifest.php +++ b/ProcessMaker/LicensedPackageManifest.php @@ -17,6 +17,7 @@ class LicensedPackageManifest extends PackageManifest const DISCOVER_PACKAGES_LOCK_KEY = 'discover_package_lock_key'; const DISCOVER_PACKAGES = 'package:discover'; + const LAST_PACKAGE_DISCOVERY = 0; protected function packagesToIgnore() diff --git a/ProcessMaker/Models/Permission.php b/ProcessMaker/Models/Permission.php index 70c6e674eb..04a58ab5a4 100644 --- a/ProcessMaker/Models/Permission.php +++ b/ProcessMaker/Models/Permission.php @@ -107,11 +107,11 @@ public function groups() /** * This retrieves the users who have permissions in a list of groups. - * + * * @param array $groups * @return Collection */ - public static function getUsersByGroup(array $groups) + public static function getUsersByGroup(array $groups) { $users = DB::table('assignables') ->join('permissions', function ($join) use ($groups) { @@ -126,6 +126,7 @@ public static function getUsersByGroup(array $groups) ->union(\ProcessMaker\Models\User::where('is_administrator', '=', true)) ->groupBy('users.id') ->get(); + return $users; } } diff --git a/ProcessMaker/Nayra/Managers/WorkflowManagerRabbitMq.php b/ProcessMaker/Nayra/Managers/WorkflowManagerRabbitMq.php index f942a69f92..131224dfd2 100644 --- a/ProcessMaker/Nayra/Managers/WorkflowManagerRabbitMq.php +++ b/ProcessMaker/Nayra/Managers/WorkflowManagerRabbitMq.php @@ -681,6 +681,7 @@ private function getEnvironmentVariables() $accessToken = Cache::remember('script-runner-' . $user->id, $expires, function () use ($user) { $user->removeOldRunScriptTokens(); $token = new GenerateAccessToken($user); + return $token->getToken(); }); $environmentVariables['API_TOKEN'] = $accessToken; diff --git a/ProcessMaker/Notifications/ProcessTranslationReady.php b/ProcessMaker/Notifications/ProcessTranslationReady.php index 9611d1149f..5bdb8b9b92 100644 --- a/ProcessMaker/Notifications/ProcessTranslationReady.php +++ b/ProcessMaker/Notifications/ProcessTranslationReady.php @@ -49,9 +49,10 @@ public function toArray($notifiable) { $data = [ 'humanLanguage' => $this->targetLanguage['humanLanguage'], - 'processName' => $this->process->name + 'processName' => $this->process->name, ]; $message = __('Process translation to :humanLanguage completed for process: :processName', $data); + return [ 'message' => $message, 'code' => $this->code, diff --git a/ProcessMaker/Policies/ProcessPolicy.php b/ProcessMaker/Policies/ProcessPolicy.php index 67bec7c543..efe717c0a1 100644 --- a/ProcessMaker/Policies/ProcessPolicy.php +++ b/ProcessMaker/Policies/ProcessPolicy.php @@ -144,7 +144,7 @@ private function isPmBlockImportedLocked(Process $process): bool /** * This determine if user can view processes. - * + * * @param User $user * @param Process $process * @return bool