WIP Label Editor

app/Console/Commands/LdapTroubleshooter.php

@@ -27,7 +27,7 @@ function ip_in_range($ip, $range)
     $wildcard_decimal = pow(2, (32 - $netmask)) - 1;
     $netmask_decimal = ~$wildcard_decimal;
 
-    return  ($ip_decimal & $netmask_decimal) == ($range_decimal & $netmask_decimal);
+    return ($ip_decimal & $netmask_decimal) == ($range_decimal & $netmask_decimal);
 }
 // NOTE - this function was shamelessly stolen from this gist: https://gist.github.com/tott/7684443
 

app/Console/Commands/RestoreFromBackup.php

@@ -456,10 +456,10 @@ public function handle()
         if (! file_exists($mysql_binary)) {
             return $this->error("mysql tool at: '$mysql_binary' does not exist, cannot restore. Please edit DB_DUMP_PATH in your .env to point to a directory that contains the mysqldump and mysql binary");
         }
-        $proc_results = proc_open("$mysql_binary -h " .
-            escapeshellarg(config('database.connections.mysql.host')) .
-            ' -u ' . escapeshellarg(config('database.connections.mysql.username')) . ' ' .
-            ' -P ' . escapeshellarg(config('database.connections.mysql.port')) . ' ' .
+        $proc_results = proc_open("$mysql_binary -h ".
+            escapeshellarg(config('database.connections.mysql.host')).
+            ' -u '.escapeshellarg(config('database.connections.mysql.username')).' '.
+            ' -P '.escapeshellarg(config('database.connections.mysql.port')).' '.
             escapeshellarg(config('database.connections.mysql.database')), // yanked -p since we pass via ENV
             [0 => ['pipe', 'r'], 1 => ['pipe', 'w'], 2 => ['pipe', 'w']],
             $pipes,

app/Http/Controllers/Api/LabelsController.php

@@ -5,6 +5,9 @@
 use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Http\Transformers\LabelsTransformer;
+use App\Models\Labels\CustomLabels\PreviewSheetLabel;
+use App\Models\Labels\CustomLabels\PreviewTapeLabel;
+use App\Models\Labels\CustomUserLabel;
 use App\Models\Labels\Label;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -21,12 +24,35 @@ public function index(Request $request): JsonResponse|array
     {
         $this->authorize('view', Label::class);
 
-        $labels = Label::find();
+        $baseLabels = Label::find()
+            ->reject(fn(Label $label) => $label instanceof PreviewSheetLabel)
+            ->reject(fn(Label $label) => $label instanceof PreviewTapeLabel)
+            ->map(function (Label $label) {
+                return [
+                    'source' => 'base',
+                    'label' => $label,
+                ];
+            });
+
+        $customLabels = CustomUserLabel::query()
+            ->get()
+            ->map(function ($label) {
+                return [
+                    'source' => 'custom',
+                    'label' => $label,
+                ];
+            });
+
+        $labels = $baseLabels->merge($customLabels);
 
         if ($request->filled('search')) {
             $search = $request->input('search');
-            $labels = $labels->filter(function ($label, $index) use ($search) {
-                return stripos($label->getName(), $search) !== false;
+
+            $labels = $labels->filter(function ($row) use ($search) {
+                $label = $row['label'];
+                $name = $row['source'] === 'custom' ? $label->name : $label->getName();
+
+                return stripos($name, $search) !== false;
             });
         }
 
@@ -41,7 +67,7 @@ public function index(Request $request): JsonResponse|array
 
         $labels = $labels->skip($offset)->take($limit);
 
-        return (new LabelsTransformer)->transformLabels($labels, $total, $request);
+        return (new LabelsTransformer)->transformLabels($labels, $total);
     }
 
     /**
@@ -51,6 +77,18 @@ public function index(Request $request): JsonResponse|array
      */
     public function show(string $labelName): JsonResponse|array
     {
+        $customLabel = CustomUserLabel::find($labelName);
+
+        if ($customLabel) {
+            $this->authorize('view', $customLabel);
+
+            return (new LabelsTransformer)->transformLabels(
+                collect([[
+                    'source' => 'custom',
+                    'label' => $customLabel,
+                ]]), 1);
+        }
+
         $labelName = str_replace('/', '\\', $labelName);
         try {
             $label = Label::find($labelName);
@@ -63,6 +101,9 @@ public function show(string $labelName): JsonResponse|array
         }
         $this->authorize('view', $label);
 
-        return (new LabelsTransformer)->transformLabel($label);
+        return (new LabelsTransformer)->transformLabels(collect([[
+            'source' => 'base',
+            'label' => $label,
+        ]]), 1);
     }
 }