Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed the graph editing modal, ordering of edge definitions was false (#8225) 

* fixed the graph editing modal, ordering of edge definitions was false

* changelog
This commit is contained in:
Heiko 2019-02-27 09:52:55 +01:00 committed by Michael Hackstein
parent e6ae1e42b1
commit b04cd607f4
11 changed files with 101 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -1,6 +1,7 @@
devel
-----
* fixed a display issues when editing a graph within the web ui
* fixed some escaping issues within the web ui.

2
js/apps/system/_admin/aardvark/APP/frontend/js/routers/versionCheck.js
View File

@ -1,5 +1,5 @@
/* jshint unused: false */
/* global $, window, navigator, _, arangoHelper */
/* global $, window, _, arangoHelper */
(function () {
'use strict';

2
js/apps/system/_admin/aardvark/APP/frontend/js/views/collectionsItemView.js
View File

@ -1,6 +1,6 @@
/* jshint browser: true */
/* jshint unused: false */
/* global window, frontendConfig, exports, Backbone, _, $, templateEngine, arangoHelper, Joi */
/* global window, frontendConfig, Backbone, _, $, templateEngine, arangoHelper, Joi */
(function () {
'use strict';

2
js/apps/system/_admin/aardvark/APP/frontend/js/views/dashboardView.js
View File

@ -1,7 +1,7 @@
/* jshint browser: true */
/* jshint unused: false */
/* global Backbone, $, window, arangoHelper, moment, nv, d3, prettyBytes */
/* global document, console, frontendConfig, Dygraph, _,templateEngine */
/* global document, frontendConfig, Dygraph, _,templateEngine */
(function () {
'use strict';

2
js/apps/system/_admin/aardvark/APP/frontend/js/views/databaseView.js
View File

@ -1,6 +1,6 @@
/* jshint browser: true */
/* jshint unused: false */
/* global window, document, Backbone, $, arangoHelper, templateEngine, Joi */
/* global window, Backbone, $, arangoHelper, templateEngine, Joi */
(function () {
'use strict';

182
js/apps/system/_admin/aardvark/APP/frontend/js/views/graphManagementView.js
View File

@ -1,6 +1,6 @@
/* jshint browser: true */
/* jshint unused: false */
/* global Backbone, $, _, window, templateEngine, arangoHelper, GraphViewerUI, require, Joi, frontendConfig */
/* global Backbone, $, _, window, templateEngine, arangoHelper, GraphViewerUI, Joi, frontendConfig */
(function () {
'use strict';
@ -827,98 +827,98 @@
);
}
if (frontendConfig.isEnterprise === true && frontendConfig.isCluster && !graph) {
tableContent.push(
window.modalView.createTextEntry(
'new-numberOfShards',
'Shards*',
'',
'Number of shards the smart graph is using.',
'',
false,
[
{
rule: Joi.string().allow('').optional().regex(/^[0-9]*$/),
msg: 'Must be a number.'
}
]
)
);
tableContent.push(
window.modalView.createTextEntry(
'new-replicationFactor',
'Replication factor',
'',
'Numeric value. Must be at least 1. Total number of copies of the data in the cluster.',
'',
false,
[
{
rule: Joi.string().allow('').optional().regex(/^[0-9]*$/),
msg: 'Must be a number.'
}
]
)
);
tableContent.push(
window.modalView.createTextEntry(
'new-smartGraphAttribute',
'Smart Graph Attribute*',
'',
'The attribute name that is used to smartly shard the vertices of a graph. \n' +
'Every vertex in this Graph has to have this attribute. \n' +
'Cannot be modified later.',
'',
false,
[
{
rule: Joi.string().allow('').optional(),
msg: 'Must be a string.'
}
]
)
);
}
if (frontendConfig.isCluster && !graph) {
tableContent.push(
window.modalView.createTextEntry(
'general-numberOfShards',
'Shards',
'',
'Number of shards the graph is using.',
'',
false,
[
{
rule: Joi.string().allow('').optional().regex(/^[0-9]*$/),
msg: 'Must be a number.'
}
]
)
);
tableContent.push(
window.modalView.createTextEntry(
'general-replicationFactor',
'Replication factor',
'',
'Numeric value. Must be at least 1. Total number of copies of the data in the cluster.',
'',
false,
[
{
rule: Joi.string().allow('').optional().regex(/^[0-9]*$/),
msg: 'Must be a number.'
}
]
)
);
}
edgeDefinitions.forEach(
function (edgeDefinition) {
if (frontendConfig.isEnterprise === true && frontendConfig.isCluster) {
tableContent.push(
window.modalView.createTextEntry(
'new-numberOfShards',
'Shards*',
'',
'Number of shards the smart graph is using.',
'',
false,
[
{
rule: Joi.string().allow('').optional().regex(/^[0-9]*$/),
msg: 'Must be a number.'
}
]
)
);
tableContent.push(
window.modalView.createTextEntry(
'new-replicationFactor',
'Replication factor',
'',
'Numeric value. Must be at least 1. Total number of copies of the data in the cluster.',
'',
false,
[
{
rule: Joi.string().allow('').optional().regex(/^[0-9]*$/),
msg: 'Must be a number.'
}
]
)
);
tableContent.push(
window.modalView.createTextEntry(
'new-smartGraphAttribute',
'Smart Graph Attribute*',
'',
'The attribute name that is used to smartly shard the vertices of a graph. \n' +
'Every vertex in this Graph has to have this attribute. \n' +
'Cannot be modified later.',
'',
false,
[
{
rule: Joi.string().allow('').optional(),
msg: 'Must be a string.'
}
]
)
);
}
if (frontendConfig.isCluster && !graph) {
tableContent.push(
window.modalView.createTextEntry(
'general-numberOfShards',
'Shards',
'',
'Number of shards the graph is using.',
'',
false,
[
{
rule: Joi.string().allow('').optional().regex(/^[0-9]*$/),
msg: 'Must be a number.'
}
]
)
);
tableContent.push(
window.modalView.createTextEntry(
'general-replicationFactor',
'Replication factor',
'',
'Numeric value. Must be at least 1. Total number of copies of the data in the cluster.',
'',
false,
[
{
rule: Joi.string().allow('').optional().regex(/^[0-9]*$/),
msg: 'Must be a number.'
}
]
)
);
}
if (self.counter === 0) {
if (edgeDefinition.collection) {
self.removedECollList.push(edgeDefinition.collection);

2
js/apps/system/_admin/aardvark/APP/frontend/js/views/loginView.js
View File

@ -1,6 +1,6 @@
/* jshint browser: true */
/* jshint unused: false */
/* global Backbone, location, document, _, arangoHelper, window, setTimeout, $, templateEngine, frontendConfig */
/* global Backbone, location, document, _, arangoHelper, window, $, templateEngine, frontendConfig */
(function () {
'use strict';

2
js/apps/system/_admin/aardvark/APP/frontend/js/views/queryManagementView.js
View File

@ -1,6 +1,6 @@
/* jshint browser: true */
/* jshint unused: false */
/* global Backbone, $, setTimeout, window, arangoHelper, templateEngine */
/* global Backbone, $, window, arangoHelper, templateEngine */
(function () {
'use strict';

2
js/apps/system/_admin/aardvark/APP/frontend/js/views/queryView.js
View File

@ -1,6 +1,6 @@
/* jshint browser: true */
/* jshint unused: false */
/* global Backbone, $, L, setTimeout, sessionStorage, ace, Storage, window, _, console, btoa */
/* global Backbone, $, L, setTimeout, sessionStorage, ace, Storage, window, _, btoa */
/* global frontendConfig, _, arangoHelper, numeral, templateEngine, Joi */
(function () {

2
js/apps/system/_admin/aardvark/APP/frontend/js/views/spotlightView.js
View File

@ -1,6 +1,6 @@
/* jshint browser: true */
/* jshint unused: false */
/* global Backbone, $, window, setTimeout, _ */
/* global Backbone, $, window, _ */
/* global arangoHelper, templateEngine */
(function () {

2
js/apps/system/_admin/aardvark/APP/frontend/js/views/userManagementView.js
View File

@ -1,6 +1,6 @@
/* jshint browser: true */
/* jshint unused: false */
/* global frontendConfig, window, document, Backbone, $, arangoHelper, templateEngine, Joi */
/* global frontendConfig, window, Backbone, $, arangoHelper, templateEngine, Joi */
(function () {
'use strict';