From bd856f7f67c2243fc0afe85908805185fe0cce73 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 3 Oct 2023 13:14:11 +0200
Subject: [PATCH] fix: volume names in services

---
 app/Models/Service.php | 6 +++---
 config/sentry.php      | 2 +-
 config/version.php     | 2 +-
 versions.json          | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/Models/Service.php b/app/Models/Service.php
index 49d8b9f33..b4a959fa6 100644
--- a/app/Models/Service.php
+++ b/app/Models/Service.php
@@ -318,8 +318,8 @@ public function parse(bool $isNew = false): Collection
                                 ]
                             );
                         } else if ($type->value() === 'volume') {
-                            $slug = Str::slug($source, '-');
-                            $name = "{$savedService->service->uuid}_{$slug}";
+                            $slugWithoutUuid = Str::slug($source, '-');
+                            $name = "{$savedService->service->uuid}_{$slugWithoutUuid}";
                             if (is_string($volume)) {
                                 $source = Str::of($volume)->before(':');
                                 $target = Str::of($volume)->after(':')->beforeLast(':');
@@ -336,7 +336,7 @@ public function parse(bool $isNew = false): Collection
                                     'resource_type' => get_class($savedService)
                                 ],
                                 [
-                                    'name' => $name,
+                                    'name' => $slugWithoutUuid,
                                     'mount_path' => $target,
                                     'resource_id' => $savedService->id,
                                     'resource_type' => get_class($savedService)
diff --git a/config/sentry.php b/config/sentry.php
index fbddc758e..22e020eb9 100644
--- a/config/sentry.php
+++ b/config/sentry.php
@@ -7,7 +7,7 @@
 
     // The release version of your application
     // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
-    'release' => '4.0.0-beta.60',
+    'release' => '4.0.0-beta.61',
     // When left empty or `null` the Laravel environment will be used
     'environment' => config('app.env'),
 
diff --git a/config/version.php b/config/version.php
index b61b5c9de..8559368c3 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.60';
+return '4.0.0-beta.61';
diff --git a/versions.json b/versions.json
index d43babfda..9c6887902 100644
--- a/versions.json
+++ b/versions.json
@@ -4,7 +4,7 @@
             "version": "3.12.36"
         },
         "v4": {
-            "version": "4.0.0-beta.60"
+            "version": "4.0.0-beta.61"
         }
     }
 }