Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Devrim Gunyel
core
Commits
bd811459
Commit
bd811459
authored
Feb 21, 2019
by
Piotr Gawron
Browse files
GuiMessageError removed in favor of ValidationError
parent
0663d184
Changes
6
Hide whitespace changes
Inline
Side-by-side
CHANGELOG
View file @
bd811459
minerva
(
12.2.0
~
beta
.2
)
unstable
;
urgency
=
medium
*
Bug
fix
:
selecting
too
few
parameters
in
export
doesn
't throw reportable
error (#721)
* Bug fix: changes in selected checkbox in add project dialog block UI (#722)
* Bug fix: providing invalid overlay id in url could break minerva (#726)
* Bug fix: Editing project with images and submaps could cause a problem
...
...
frontend-js/src/main/js/GuiConnector.js
View file @
bd811459
...
...
@@ -7,7 +7,6 @@ var logger = require('./logger');
var
Functions
=
require
(
'
./Functions
'
);
var
SecurityError
=
require
(
'
./SecurityError
'
);
var
ValidationError
=
require
(
'
./ValidationError
'
);
var
GuiMessageError
=
require
(
'
./gui/GuiMessageError
'
);
/**
* This static global object contains set of functions that returns/set data in
...
...
frontend-js/src/main/js/gui/GuiMessageError.js
deleted
100644 → 0
View file @
0663d184
"
use strict
"
;
/* exported logger */
var
logger
=
require
(
'
../logger
'
);
/**
*
* @param {string} message
* @constructor
* @extends {Error}
*/
function
GuiMessageError
(
message
)
{
this
.
message
=
message
;
this
.
stack
=
(
new
Error
(
message
)).
stack
;
}
GuiMessageError
.
prototype
=
Object
.
create
(
Error
.
prototype
);
GuiMessageError
.
prototype
.
constructor
=
GuiMessageError
;
module
.
exports
=
GuiMessageError
;
frontend-js/src/main/js/gui/export/ElementExportPanel.js
View file @
bd811459
...
...
@@ -3,7 +3,7 @@
/* exported logger */
var
AbstractExportPanel
=
require
(
'
./AbstractExportPanel
'
);
var
GuiMessage
Error
=
require
(
'
../
GuiMessage
Error
'
);
var
Validation
Error
=
require
(
'
../
../Validation
Error
'
);
var
IdentifiedElement
=
require
(
'
../../map/data/IdentifiedElement
'
);
// noinspection JSUnusedLocalSymbols
...
...
@@ -71,7 +71,7 @@ ElementExportPanel.prototype.createResponseString = function () {
var
elements
=
[];
return
self
.
getSelectedTypes
().
then
(
function
(
result
)
{
if
(
result
.
length
===
0
)
{
return
Promise
.
reject
(
new
GuiMessage
Error
(
"
You must select at least one type
"
));
return
Promise
.
reject
(
new
Validation
Error
(
"
You must select at least one type
"
));
}
types
=
result
;
return
self
.
getSelectedIncludedCompartments
();
...
...
@@ -108,7 +108,7 @@ ElementExportPanel.prototype.createResponseString = function () {
return
self
.
getSelectedColumns
();
}).
then
(
function
(
selectedColumns
)
{
if
(
selectedColumns
.
length
===
0
)
{
return
Promise
.
reject
(
new
GuiMessage
Error
(
"
You must select at least one column
"
));
return
Promise
.
reject
(
new
Validation
Error
(
"
You must select at least one column
"
));
}
var
rowPromises
=
[];
...
...
frontend-js/src/main/js/gui/export/NetworkExportPanel.js
View file @
bd811459
...
...
@@ -8,7 +8,7 @@ var Promise = require("bluebird");
// noinspection JSUnusedLocalSymbols
var
logger
=
require
(
'
../../logger
'
);
var
Functions
=
require
(
'
../../Functions
'
);
var
GuiMessage
Error
=
require
(
'
../
GuiMessage
Error
'
);
var
Validation
Error
=
require
(
'
../
../Validation
Error
'
);
var
Alias
=
require
(
'
../../map/data/Alias
'
);
/**
...
...
@@ -167,13 +167,13 @@ NetworkExportPanel.prototype.createResponseString = function () {
var
reactionTypesDiv
=
$
(
"
[name='reactionTypes']
"
,
self
.
getElement
())[
0
];
return
self
.
getSelectedTypes
(
elementTypesDiv
).
then
(
function
(
result
)
{
if
(
result
.
length
===
0
)
{
return
Promise
.
reject
(
new
GuiMessage
Error
(
"
You must select at least one element type
"
));
return
Promise
.
reject
(
new
Validation
Error
(
"
You must select at least one element type
"
));
}
elementTypes
=
result
;
return
self
.
getSelectedTypes
(
reactionTypesDiv
);
}).
then
(
function
(
result
)
{
if
(
result
.
length
===
0
)
{
return
Promise
.
reject
(
new
GuiMessage
Error
(
"
You must select at least one reaction type
"
));
return
Promise
.
reject
(
new
Validation
Error
(
"
You must select at least one reaction type
"
));
}
reactionTypes
=
result
;
return
self
.
getSelectedIncludedCompartments
();
...
...
@@ -221,7 +221,7 @@ NetworkExportPanel.prototype.createResponseString = function () {
return
self
.
getSelectedColumns
();
}).
then
(
function
(
selectedColumns
)
{
if
(
selectedColumns
.
length
===
0
)
{
return
Promise
.
reject
(
new
GuiMessage
Error
(
"
You must select at least one column
"
));
return
Promise
.
reject
(
new
Validation
Error
(
"
You must select at least one column
"
));
}
var
rowPromises
=
[];
...
...
frontend-js/src/test/js/gui/export/ElementExportPanel-test.js
View file @
bd811459
...
...
@@ -3,7 +3,7 @@
require
(
"
../../mocha-config.js
"
);
var
ElementExportPanel
=
require
(
'
../../../../main/js/gui/export/ElementExportPanel
'
);
var
GuiMessage
Error
=
require
(
'
../../../../main/js/
gui/GuiMessage
Error
'
);
var
Validation
Error
=
require
(
'
../../../../main/js/
Validation
Error
'
);
var
MiriamType
=
require
(
'
../../../../main/js/map/data/MiriamType
'
);
var
ServerConnector
=
require
(
'
../../ServerConnector-mock
'
);
var
logger
=
require
(
'
../../logger
'
);
...
...
@@ -197,7 +197,7 @@ describe('ElementExportPanel', function () {
}).
then
(
function
()
{
return
exportObject
.
createResponseString
();
}).
then
(
null
,
function
(
error
)
{
assert
.
ok
(
error
instanceof
GuiMessage
Error
);
assert
.
ok
(
error
instanceof
Validation
Error
);
});
});
});
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment