Skip to content
This repository was archived by the owner on Aug 29, 2025. It is now read-only.

resolves issue-90 #91

Merged
alexandresobolevski merged 1 commit into from
Sep 19, 2016
Merged

resolves issue-90 #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/components/Settings/ConnectButton/ConnectButton.react.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export default class ConnectButton extends Component {
this.updateStatus(APP_STATUS.CONNECTED);
}
} else {
if (nextProps.ipc.getIn(['error', 'type']) === 'connection') {
if (nextProps.ipc.getIn(['error', 'name']) === 'ConnectionError') {
this.updateStatus(APP_STATUS.CON_ERROR);
} else if (status !== APP_STATUS.CON_ERROR) {
this.updateStatus(APP_STATUS.ERROR);
Expand Down
8 changes: 4 additions & 4 deletions backend/messageHandler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ function handleMessage(sequelizeManager, opts) {
sequelizeManager.raiseError(
merge(
{message: AUTHENTICATION({error})},
{type: 'connection'}),
{name: 'ConnectionError'}),
responseSender
);
})
Expand Down Expand Up @@ -243,7 +243,7 @@ function handleMessage(sequelizeManager, opts) {
sequelizeManager.raiseError(
merge(
{message: AUTHENTICATION({error})},
{type: 'connection'}),
{name: 'ConnectionError'}),
responseSender
);
})
Expand Down Expand Up @@ -331,7 +331,7 @@ function handleMessage(sequelizeManager, opts) {
sequelizeManager.connect(message)
.catch((error) => {
sequelizeManager.raiseError(
merge(error, {type: 'connection'}),
merge(error, {name: 'ConnectionError'}),
responseSender
);
})
Expand Down Expand Up @@ -374,7 +374,7 @@ function handleMessage(sequelizeManager, opts) {
.then(sequelizeManager.selectDatabase(message))
.catch((error) => {
sequelizeManager.raiseError(
merge(error, {type: 'connection'}),
merge(error, {name: 'ConnectionError'}),
responseSender
);
})
Expand Down
6 changes: 3 additions & 3 deletions backend/sequelizeManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ export class SequelizeManager {
this.raiseError(
merge(
{message: APP_NOT_CONNECTED},
{type: 'connection'}
{name: 'ConnectionError'}
),
responseSender
);
Expand All @@ -166,8 +166,8 @@ export class SequelizeManager {
.catch((error) => {
this.raiseError(
merge(
{mesage: AUTHENTICATION(error)},
{type: 'connection'}),
{message: AUTHENTICATION(error)},
{name: 'ConnectionError'}),
responseSender
);
});
Expand Down