fix(new-structure): Drop custom ordering/Fix dots

Drop custom ordering for translations Fix dot-notation
visual-ideas · Jul 7, 2023 · 719f489 · 719f489
1 parent 8e9a8a1
commit 719f489
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 7 deletions.
diff --git a/.../migrations/2023_07_08_140130_drop_list_order_in_moonshine_laravel_translations_table.php b/.../migrations/2023_07_08_140130_drop_list_order_in_moonshine_laravel_translations_table.php
@@ -0,0 +1,27 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('moonshine_laravel_translations', function (Blueprint $table) {
+            $table->dropColumn('list_order');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('moonshine_laravel_translations', function (Blueprint $table) {
+            $table->unsignedSmallInteger('list_order')->default(65535)->after('group');
+        });
+    }
+};
diff --git a/src/Actions/ExportTranslationsAction.php b/src/Actions/ExportTranslationsAction.php
@@ -24,7 +24,7 @@ public function handle(): RedirectResponse
             'root' => lang_path(),
         ]);
 
-        $translations = MoonshineLaravelTranslation::orderBy('list_order')->get();
+        $translations = MoonshineLaravelTranslation::orderBy('group, key')->get();
 
         $translations = $translations->mapWithKeys(function (
             MoonshineLaravelTranslation $moonshineLaravelTranslation,
@@ -43,6 +43,8 @@ public function handle(): RedirectResponse
         foreach ($translations as $locale => $localeData) {
             foreach ($localeData as $group => $groupData) {
 
+                $groupData = Arr::undot($groupData);
+
                 if ($group == 'json') {
 
                     $langDisk->put(

diff --git a/src/Actions/ImportTranslationsAction.php b/src/Actions/ImportTranslationsAction.php
@@ -45,7 +45,6 @@ public function handle(): RedirectResponse
                 foreach ($arrayTranslations as $key => $value) {
                     $this->updateOrCreateTranslation([
                         'group' => $groupName,
-                        'list_order' => $i,
                         'key' => $key,
                         'locale' => $locale,
                         'value' => $value,
@@ -61,16 +60,13 @@ public function handle(): RedirectResponse
                 $groupName = $fileName->replaceFirst($locale.'/', '')->replaceLast('.php', '');
                 $arrayTranslations = include lang_path($fileName->toString());
                 $arrayTranslations = Arr::dot($arrayTranslations);
-                $i = 0;
                 foreach ($arrayTranslations as $key => $value) {
                     $this->updateOrCreateTranslation([
                         'group' => $groupName,
-                        'list_order' => $i,
                         'key' => $key,
                         'locale' => $locale,
                         'value' => $value,
                     ]);
-                    $i++;
                 }
 
                 return;
@@ -109,7 +105,6 @@ protected function updateOrCreateTranslation(array $data)
             'group' => $data['group'],
             'key' => $data['key'],
         ], [
-            'list_order' => $data['list_order'] ?? 0,
             'is_changed' => false,
         ]);
 

diff --git a/src/Models/MoonshineLaravelTranslation.php b/src/Models/MoonshineLaravelTranslation.php
@@ -17,7 +17,6 @@ class MoonshineLaravelTranslation extends Model
 
     protected $fillable = [
         'group',
-        'list_order',
         'key',
         'locale',
         'value',