Merge pull request ravendb#19914 from ppekrol/v6.2

6.0 to 6.2 merge
djordjedjukic · Jan 8, 2025 · 9b9d481 · 9b9d481
2 parents 9ef1873 + ccb10bd
commit 9b9d481
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/src/Corax/Indexing/IndexedField.cs b/src/Corax/Indexing/IndexedField.cs
@@ -2,6 +2,7 @@
 using Corax.Analyzers;
 using Corax.Mappings;
 using Sparrow.Collections;
+using Sparrow.Server;
 using Voron;
 using Voron.Util;
 
@@ -127,8 +128,8 @@ public IndexedField CreateVirtualIndexedField(IndexFieldBinding dynamicField)
                 break;
         }
 
-        return new IndexedField(Constants.IndexWriter.DynamicField, dynamicField.FieldName, dynamicField.FieldNameLong, dynamicField.FieldNameDouble,
-            dynamicField.FieldTermTotalSumField, analyzer, fieldIndexingMode, dynamicField.HasSuggestions, dynamicField.ShouldStore,
+        return new IndexedField(Constants.IndexWriter.DynamicField, Name, NameLong, NameDouble,
+            NameTotalLengthOfTerms, analyzer, fieldIndexingMode, dynamicField.HasSuggestions, dynamicField.ShouldStore,
             SupportedFeatures, dynamicField.FieldNameForStatistics, FieldRootPage, TermsVectorFieldRootPage, Storage, Textual, Longs, Doubles, this);
     }
 

diff --git a/src/Raven.Server/Web/System/AdminDatabasesHandler.cs b/src/Raven.Server/Web/System/AdminDatabasesHandler.cs
@@ -810,7 +810,7 @@ private void AssertCanDeleteDatabase(string databaseName, DatabaseStateStatus st
             if (state != DatabaseStateStatus.RestoreInProgress)
                 return;
 
-            var restoredOnNode = topology.Members.First(); // we restore only on one node
+            var restoredOnNode = topology.AllNodes.First(); // we restore only on one node
             if (ServerStore.NodeTag != restoredOnNode)
                 throw new InvalidOperationException($"Can't delete database '{databaseName}' while the restore " +
                                                     $"process is in progress. In order to delete the database, " +

diff --git a/src/Raven.Studio/wwwroot/Content/scss/_colors.scss b/src/Raven.Studio/wwwroot/Content/scss/_colors.scss
@@ -102,6 +102,8 @@ $token-keyword: $color-5;
 $token-deleted: $color-1;
 $token-important: $color-2-2;
 
+$developer: #c7ff6b;
+
 // Blue Theme
 @if $theme == "blue" {
     $black: #172138;
@@ -173,6 +175,8 @@ $token-important: $color-2-2;
     $ace-character: $token-important;
     $ace-name: $token-keyword;
     $ace-constant: $token-operator;
+
+    $developer: darken(#c7ff6b, 33%);
 }
 
 // Light Theme
@@ -254,6 +258,8 @@ $token-important: $color-2-2;
 
     $row-bg: $white;
     $row-even-bg: $gray-100;
+
+    $developer: darken(#c7ff6b, 33%);
 }
 
 // Classic Theme
@@ -363,7 +369,6 @@ $progress-color: $color-2-3;
 $free: $color-4;
 $professional: $color-4-2;
 $enterprise: $color-5;
-$developer: #c7ff6b;
 
 // Color system
 // scss-docs-end gray-color-variables

diff --git a/src/Raven.Studio/wwwroot/Content/scss/_custom-properties.scss b/src/Raven.Studio/wwwroot/Content/scss/_custom-properties.scss
@@ -24,7 +24,7 @@ $prefix: "bs-";
     --hover-filter: #{$hover-filter};
     --shadow-color: #{to-rgb($shadow-color)};
 
-    --license-developer: #c7ff6b;
+    --license-developer: #{$developer};
     --license-cloud: #{$brand-cloud};
     --license-community: #{$color-4};
     --license-professional: #{$color-4-2};