From e0cd8516b8218b42d704dbc12b1f7fde7134bd26 Mon Sep 17 00:00:00 2001
From: Red J Adaya <red.adaya@gmail.com>
Date: Sun, 29 Oct 2023 04:14:20 +0800
Subject: [PATCH] update color tab names (#49)

* change color names and values

* migrations

* update tab colors in fe

* set to default instead of null

* minor server fixes
---
 src/app/common/modals/modals.less             |  7 +++++--
 src/app/common/themes/themes.less             | 19 ++++++++++---------
 src/app/workspace/screen/tabs.less            | 10 ++++++++--
 src/model/model.ts                            |  2 +-
 .../000024_updatetabcolornames.down.sql       |  1 +
 .../000024_updatetabcolornames.up.sql         |  3 +++
 wavesrv/pkg/cmdrunner/cmdrunner.go            |  2 +-
 wavesrv/pkg/sstore/migrate.go                 |  2 +-
 8 files changed, 30 insertions(+), 16 deletions(-)
 create mode 100644 wavesrv/db/migrations/000024_updatetabcolornames.down.sql
 create mode 100644 wavesrv/db/migrations/000024_updatetabcolornames.up.sql

diff --git a/src/app/common/modals/modals.less b/src/app/common/modals/modals.less
index 62fd4060..90066311 100644
--- a/src/app/common/modals/modals.less
+++ b/src/app/common/modals/modals.less
@@ -341,8 +341,11 @@
         .tab-color-icon.color-white path {
             fill: @tab-white;
         }
-        .tab-color-icon.color-black path {
-            fill: @tab-black;
+        .tab-color-icon.color-violet path {
+            fill: @tab-violet;
+        }
+        .tab-color-icon.color-pink path {
+            fill: @tab-pink;
         }
 
         .tab-colors {
diff --git a/src/app/common/themes/themes.less b/src/app/common/themes/themes.less
index e4fa77cf..b6b6f939 100644
--- a/src/app/common/themes/themes.less
+++ b/src/app/common/themes/themes.less
@@ -35,15 +35,16 @@
 @term-bright-cyan: #34e2e2;
 @term-bright-white: #ffffff;
 
-@tab-black: rgb(50, 50, 50);
-@tab-red: rgb(205, 49, 49);
-@tab-green: rgb(0, 128, 0);
-@tab-orange: rgb(255, 199, 6);
-@tab-yellow: rgb(229, 229, 16);
-@tab-blue: rgb(0, 71, 171);
-@tab-magenta: rgb(188, 63, 188);
-@tab-cyan: rgb(17, 168, 205);
-@tab-white: rgb(249, 249, 249);
+@tab-red: #e54d2e;
+@tab-green: #58c142;
+@tab-orange: #ef713b;
+@tab-violet: #8b46d0;
+@tab-cyan: #3abab6;
+@tab-magenta: #fc3651;
+@tab-pink: #e05677;
+@tab-blue: #5460cf;
+@tab-yellow: #e0b956;
+@tab-white: #ffffff;
 
 @tab-black-text: #333;
 @tab-white-text: #d7d7d7;
diff --git a/src/app/workspace/screen/tabs.less b/src/app/workspace/screen/tabs.less
index 95a3fbea..ea4d420c 100644
--- a/src/app/workspace/screen/tabs.less
+++ b/src/app/workspace/screen/tabs.less
@@ -59,9 +59,15 @@
         }
     }
 
-    &.color-black {
+    &.color-violet {
         svg.left-icon path {
-            fill: @tab-black;
+            fill: @tab-violet;
+        }
+    }
+
+    &.color-pink {
+        svg.left-icon path {
+            fill: @tab-pink;
         }
     }
 
diff --git a/src/model/model.ts b/src/model/model.ts
index b259f9b6..f658fb68 100644
--- a/src/model/model.ts
+++ b/src/model/model.ts
@@ -93,7 +93,7 @@ const MinFontSize = 8;
 const MaxFontSize = 15;
 const InputChunkSize = 500;
 const RemoteColors = ["red", "green", "yellow", "blue", "magenta", "cyan", "white", "orange"];
-const TabColors = ["red", "green", "yellow", "blue", "magenta", "cyan", "white", "orange", "black"];
+const TabColors = ["yellow", "blue", "pink", "magenta", "cyan", "violet", "orange", "green", "red", "white"];
 
 // @ts-ignore
 const VERSION = __PROMPT_VERSION__;
diff --git a/wavesrv/db/migrations/000024_updatetabcolornames.down.sql b/wavesrv/db/migrations/000024_updatetabcolornames.down.sql
new file mode 100644
index 00000000..a08e72a5
--- /dev/null
+++ b/wavesrv/db/migrations/000024_updatetabcolornames.down.sql
@@ -0,0 +1 @@
+-- no down migration
\ No newline at end of file
diff --git a/wavesrv/db/migrations/000024_updatetabcolornames.up.sql b/wavesrv/db/migrations/000024_updatetabcolornames.up.sql
new file mode 100644
index 00000000..92563172
--- /dev/null
+++ b/wavesrv/db/migrations/000024_updatetabcolornames.up.sql
@@ -0,0 +1,3 @@
+UPDATE screen 
+SET screenopts = json_set(screenopts, '$.tabcolor', 'default') 
+WHERE json_extract(screenopts, '$.tabcolor') = 'black';
diff --git a/wavesrv/pkg/cmdrunner/cmdrunner.go b/wavesrv/pkg/cmdrunner/cmdrunner.go
index 368a581f..93dbbb1f 100644
--- a/wavesrv/pkg/cmdrunner/cmdrunner.go
+++ b/wavesrv/pkg/cmdrunner/cmdrunner.go
@@ -71,7 +71,7 @@ const (
 	KwArgLang     = "lang"
 )
 
-var ColorNames = []string{"black", "red", "green", "yellow", "blue", "magenta", "cyan", "white", "orange"}
+var ColorNames = []string{"yellow", "blue", "pink", "magenta", "cyan", "violet", "orange", "green", "red", "white"}
 var RemoteColorNames = []string{"red", "green", "yellow", "blue", "magenta", "cyan", "white", "orange"}
 var RemoteSetArgs = []string{"alias", "connectmode", "key", "password", "autoinstall", "color"}
 
diff --git a/wavesrv/pkg/sstore/migrate.go b/wavesrv/pkg/sstore/migrate.go
index eefce745..afd8bfd7 100644
--- a/wavesrv/pkg/sstore/migrate.go
+++ b/wavesrv/pkg/sstore/migrate.go
@@ -20,7 +20,7 @@ import (
 	"github.com/golang-migrate/migrate/v4"
 )
 
-const MaxMigration = 23
+const MaxMigration = 24
 const MigratePrimaryScreenVersion = 9
 const CmdScreenSpecialMigration = 13
 const CmdLineSpecialMigration = 20