fix some UI issues for database defaults (arangodb#10698)

jsteemann · KVS85 · commit c107229c093f · 2019-12-12T19:41:29.000+03:00
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/collectionsView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/collectionsView.js
@@ -472,7 +472,7 @@
             // if we are in the cluster and are not using distribute shards like
             // then we want to make use of the replication factor
             tmpObj.replicationFactor = replicationFactor === "satellite" ? replicationFactor : Number(replicationFactor);
-            tmpObj.minReplicationFactor = Number(writeConcern);
+            tmpObj.writeConcern = Number(writeConcern);
           }
 
           if (!abort) {
@@ -578,7 +578,7 @@
                 window.modalView.createTextEntry(
                   'new-replication-factor',
                   'Replication factor',
-                  ['', 'flexible'].indexOf(properties.sharding) !== -1 ? properties.replicationFactor : '',
+                  properties.replicationFactor ? properties.replicationFactor : '',
                   'Numeric value. Must be between ' + 
                   (this.minReplicationFactor ? this.minReplicationFactor : 1) + 
                   ' and ' + 
@@ -647,7 +647,7 @@
               window.modalView.createTextEntry(
                 'new-write-concern',
                 'Write concern',
-                ['', 'flexible'].indexOf(properties.sharding) !== -1 ? properties.minReplicationFactor : '',
+                properties.writeConcern ? properties.writeConcern : '',
                 'Numeric value. Must be at least 1. Must be smaller or equal compared to the replication factor. Total number of copies of the data in the cluster that are required for each write operation. If we get below this value the collection will be read-only until enough copies are created.',
                 '',
                 false,
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/databaseView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/databaseView.js
@@ -436,7 +436,7 @@
             'newSharding',
             'Sharding',
             'flexible',
-            'some nice description TODO',
+            'Selects the default sharding setup for new collections in this database. *flexible* means that shards of different collections by default will be randomly distributed to database servers. *single* means that collections by default will use the same sharding setup (number of shards and shard distribution) as one of the system collections.',
             sharding
           )
         );

Original file line number	Diff line number	Diff line change
`@@ -436,7 +436,7 @@`
`436`	`436`	`'newSharding',`
`437`	`437`	`'Sharding',`
`438`	`438`	`'flexible',`
`439`		`- 'some nice description TODO',`
	`439`	`+ 'Selects the default sharding setup for new collections in this database. flexible means that shards of different collections by default will be randomly distributed to database servers. single means that collections by default will use the same sharding setup (number of shards and shard distribution) as one of the system collections.',`
`440`	`440`	`sharding`
`441`	`441`	`)`
`442`	`442`	`);`