From 50047035b8ce3026d3f2063b36126528e19a5f8d Mon Sep 17 00:00:00 2001 From: Peter Dulacka Date: Tue, 5 Sep 2023 12:14:22 +0200 Subject: [PATCH] Fix invalid namespaces after the Beam module refactoring (cherry picked from commit bb8122237053cf481ce06c6ea2dfdf9a29eeee3c) --- Beam/app/Http/Kernel.php | 2 -- .../database/factories/ArticlePageviewsFactory.php | 2 +- .../database/factories/ArticleTimespentFactory.php | 2 +- .../beam-module/resources/lang/en/entities.php | 12 ++++++------ .../resources/views/entities/_form.blade.php | 2 +- .../Commands/ProcessPageviewLoyalVisitors.php | 2 +- .../src/Http/Controllers/NewsletterController.php | 4 ++-- .../src/Http/Controllers/SegmentController.php | 2 +- changelogs/CHANGELOG-v3.2.md | 1 + 9 files changed, 14 insertions(+), 15 deletions(-) diff --git a/Beam/app/Http/Kernel.php b/Beam/app/Http/Kernel.php index 3b3d1b97d..ae91adb12 100644 --- a/Beam/app/Http/Kernel.php +++ b/Beam/app/Http/Kernel.php @@ -2,9 +2,7 @@ namespace App\Http; -use App\Http\Middleware\DashboardBasicAuth; use Illuminate\Foundation\Http\Kernel as HttpKernel; -use Remp\LaravelSso\Http\Middleware\VerifyJwtToken; class Kernel extends HttpKernel { diff --git a/Beam/extensions/beam-module/database/factories/ArticlePageviewsFactory.php b/Beam/extensions/beam-module/database/factories/ArticlePageviewsFactory.php index be2d75558..540b70fba 100644 --- a/Beam/extensions/beam-module/database/factories/ArticlePageviewsFactory.php +++ b/Beam/extensions/beam-module/database/factories/ArticlePageviewsFactory.php @@ -31,7 +31,7 @@ public function definition() return [ 'article_id' => function () { - return \App\Article::factory()->create()->id; + return \Remp\BeamModule\Model\Article::factory()->create()->id; }, 'time_from' => $timeFrom, 'time_to' => $timeTo, diff --git a/Beam/extensions/beam-module/database/factories/ArticleTimespentFactory.php b/Beam/extensions/beam-module/database/factories/ArticleTimespentFactory.php index a05d4128d..001e669ad 100644 --- a/Beam/extensions/beam-module/database/factories/ArticleTimespentFactory.php +++ b/Beam/extensions/beam-module/database/factories/ArticleTimespentFactory.php @@ -31,7 +31,7 @@ public function definition() return [ 'article_id' => function () { - return \App\Article::factory()->create()->id; + return \Remp\BeamModule\Model\Article::factory()->create()->id; }, 'time_from' => $timeFrom, 'time_to' => $timeTo, diff --git a/Beam/extensions/beam-module/resources/lang/en/entities.php b/Beam/extensions/beam-module/resources/lang/en/entities.php index d2270a514..3e261926f 100644 --- a/Beam/extensions/beam-module/resources/lang/en/entities.php +++ b/Beam/extensions/beam-module/resources/lang/en/entities.php @@ -2,11 +2,11 @@ return [ "types" => [ - App\EntityParam::TYPE_STRING => "String", - App\EntityParam::TYPE_STRING_ARRAY => "StringArray", - App\EntityParam::TYPE_NUMBER => "Number", - App\EntityParam::TYPE_NUMBER_ARRAY => "NumberArray", - App\EntityParam::TYPE_BOOLEAN => "Boolean", - App\EntityParam::TYPE_DATETIME => "DateTime", + \Remp\BeamModule\Model\EntityParam::TYPE_STRING => "String", + \Remp\BeamModule\Model\EntityParam::TYPE_STRING_ARRAY => "StringArray", + \Remp\BeamModule\Model\EntityParam::TYPE_NUMBER => "Number", + \Remp\BeamModule\Model\EntityParam::TYPE_NUMBER_ARRAY => "NumberArray", + \Remp\BeamModule\Model\EntityParam::TYPE_BOOLEAN => "Boolean", + \Remp\BeamModule\Model\EntityParam::TYPE_DATETIME => "DateTime", ] ]; diff --git a/Beam/extensions/beam-module/resources/views/entities/_form.blade.php b/Beam/extensions/beam-module/resources/views/entities/_form.blade.php index b6518ac89..1de739d25 100644 --- a/Beam/extensions/beam-module/resources/views/entities/_form.blade.php +++ b/Beam/extensions/beam-module/resources/views/entities/_form.blade.php @@ -9,7 +9,7 @@ "parent_id": '{!! $entity->parent_id !!}' || null, "name": '{!! $entity->name !!}', "params": {!! @json($entity->params) !!}, - "types": {!! @json(\App\EntityParam::getAllTypes()) !!}, + "types": {!! @json(\Remp\BeamModule\Model\EntityParam::getAllTypes()) !!}, "rootEntities": {!! @json($rootEntities) !!} || null, "validateUrl": {!! @json(route('entities.validateForm', ['entity' => $entity])) !!} }; diff --git a/Beam/extensions/beam-module/src/Console/Commands/ProcessPageviewLoyalVisitors.php b/Beam/extensions/beam-module/src/Console/Commands/ProcessPageviewLoyalVisitors.php index 69d1d0a80..90fe562ad 100644 --- a/Beam/extensions/beam-module/src/Console/Commands/ProcessPageviewLoyalVisitors.php +++ b/Beam/extensions/beam-module/src/Console/Commands/ProcessPageviewLoyalVisitors.php @@ -91,7 +91,7 @@ public function handle(JournalContract $journalContract) } $segmentCode = "{$treshold}-plus-article-views-in-{$days}-days"; - if (\App\Segment::where(['code' => $segmentCode])->exists()) { + if (Segment::where(['code' => $segmentCode])->exists()) { $this->line("Segment {$segmentCode} already exists, no new segment was created"); return 2; } diff --git a/Beam/extensions/beam-module/src/Http/Controllers/NewsletterController.php b/Beam/extensions/beam-module/src/Http/Controllers/NewsletterController.php index 346aa9503..7d7d9c0eb 100644 --- a/Beam/extensions/beam-module/src/Http/Controllers/NewsletterController.php +++ b/Beam/extensions/beam-module/src/Http/Controllers/NewsletterController.php @@ -88,7 +88,7 @@ public function create() return response()->format([ 'html' => view( - 'newsletters.create', + 'beam::newsletters.create', compact(['newsletter', 'segments', 'generators', 'criteria', 'mailTypes']) ), 'json' => [], @@ -105,7 +105,7 @@ public function edit($id) return response()->format([ 'html' => view( - 'newsletters.edit', + 'beam::newsletters.edit', compact(['newsletter', 'segments', 'generators', 'criteria', 'mailTypes']) ), 'json' => [], diff --git a/Beam/extensions/beam-module/src/Http/Controllers/SegmentController.php b/Beam/extensions/beam-module/src/Http/Controllers/SegmentController.php index 153f8ce66..e14417a61 100644 --- a/Beam/extensions/beam-module/src/Http/Controllers/SegmentController.php +++ b/Beam/extensions/beam-module/src/Http/Controllers/SegmentController.php @@ -195,7 +195,7 @@ public function update(SegmentRequest $request, Segment $segment) /** * Remove the specified resource from storage. * - * @param \App\Segment $segment + * @param \Remp\BeamModule\Model\Segment $segment * @return \Illuminate\Http\Response */ public function destroy(Segment $segment) diff --git a/changelogs/CHANGELOG-v3.2.md b/changelogs/CHANGELOG-v3.2.md index e39df298d..c4f7cc17f 100644 --- a/changelogs/CHANGELOG-v3.2.md +++ b/changelogs/CHANGELOG-v3.2.md @@ -1,6 +1,7 @@ ## [3.2] - 2023-08-24 - [3.2.1] [Mailer]: Fixed Mailer segment provider users acquiring. Provided segment code needs to be processed before fetching users from database. remp/mnt#114 +- [3.2.2] [Mailer]: Fixed Beam's invalid namespaces and routes. ### Project