From 9a85ca0bdb7272d596c2dbec1464261f76c5d67e Mon Sep 17 00:00:00 2001
From: Dimitrie Stefanescu <didimitrie@gmail.com>
Date: Sun, 10 Oct 2021 11:56:01 +0100
Subject: [PATCH] feat(frontend): cleans up filenames & adds extra validation
 for branch names

---
 .../src/components/dialogs/BranchNewDialog.vue         | 10 ++++------
 packages/frontend/src/router/index.js                  |  6 +++---
 .../src/views/{Frontend_re.vue => Frontend.vue}        |  0
 .../src/views/stream/{Details_re.vue => Details.vue}   |  0
 .../src/views/stream/{Stream_re_re.vue => Stream.vue}  |  0
 5 files changed, 7 insertions(+), 9 deletions(-)
 rename packages/frontend/src/views/{Frontend_re.vue => Frontend.vue} (100%)
 rename packages/frontend/src/views/stream/{Details_re.vue => Details.vue} (100%)
 rename packages/frontend/src/views/stream/{Stream_re_re.vue => Stream.vue} (100%)

diff --git a/packages/frontend/src/components/dialogs/BranchNewDialog.vue b/packages/frontend/src/components/dialogs/BranchNewDialog.vue
index 4dc207a4b..6a5998b8f 100644
--- a/packages/frontend/src/components/dialogs/BranchNewDialog.vue
+++ b/packages/frontend/src/components/dialogs/BranchNewDialog.vue
@@ -42,18 +42,16 @@ export default {
       showError: false,
       error: null,
       streamId: null,
-      branchNames: ['main', 'globals'],
+      reservedBranchNames: ['main', 'globals'],
       valid: false,
       loading: false,
       name: null,
       nameRules: [
         (v) => !!v || 'Branches need a name too!',
+        (v) => !(v.startsWith('#') || v.startsWith('/')) || 'Branch names cannot start with "#" or "/"',
         (v) =>
-          (v && !v.startsWith('globals')) ||
-          'Globals is a reserved branch name. Please choose a different name.',
-        (v) =>
-          (v && this.branchNames.findIndex((e) => e === v) === -1) ||
-          'A branch with this name already exists',
+          (v && this.reservedBranchNames.findIndex((e) => e === v) === -1) ||
+          'This is a reserved branch name',
         (v) => (v && v.length <= 100) || 'Name must be less than 100 characters',
         (v) => (v && v.length >= 3) || 'Name must be at least 3 characters'
       ],
diff --git a/packages/frontend/src/router/index.js b/packages/frontend/src/router/index.js
index 8e0563d3e..1fe39ad5d 100644
--- a/packages/frontend/src/router/index.js
+++ b/packages/frontend/src/router/index.js
@@ -57,7 +57,7 @@ const routes = [
     meta: {
       title: 'Home | Speckle'
     },
-    component: () => import('@/views/Frontend_re.vue'),
+    component: () => import('@/views/Frontend.vue'),
     children: [
       {
         path: '',
@@ -80,7 +80,7 @@ const routes = [
         meta: {
           title: 'Stream | Speckle'
         },
-        component: () => import('@/views/stream/Stream_re_re.vue'),
+        component: () => import('@/views/stream/Stream.vue'),
         children: [
           {
             path: '',
@@ -88,7 +88,7 @@ const routes = [
             meta: {
               title: 'Stream | Speckle'
             },
-            component: () => import('@/views/stream/Details_re.vue')
+            component: () => import('@/views/stream/Details.vue')
           },
 
           {
diff --git a/packages/frontend/src/views/Frontend_re.vue b/packages/frontend/src/views/Frontend.vue
similarity index 100%
rename from packages/frontend/src/views/Frontend_re.vue
rename to packages/frontend/src/views/Frontend.vue
diff --git a/packages/frontend/src/views/stream/Details_re.vue b/packages/frontend/src/views/stream/Details.vue
similarity index 100%
rename from packages/frontend/src/views/stream/Details_re.vue
rename to packages/frontend/src/views/stream/Details.vue
diff --git a/packages/frontend/src/views/stream/Stream_re_re.vue b/packages/frontend/src/views/stream/Stream.vue
similarity index 100%
rename from packages/frontend/src/views/stream/Stream_re_re.vue
rename to packages/frontend/src/views/stream/Stream.vue