Skip to content

Commit

Permalink
fix: no connection passed to connection's edit modal
Browse files Browse the repository at this point in the history
  • Loading branch information
Fabio286 committed Oct 5, 2020
1 parent 319d9be commit ce25cd0
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 14 deletions.
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,28 +53,28 @@
"lodash": "^4.17.20",
"moment": "^2.29.0",
"monaco-editor": "^0.20.0",
"mssql": "^6.2.2",
"mssql": "^6.2.3",
"mysql": "^2.18.1",
"pg": "^8.3.3",
"pg": "^8.4.0",
"source-map-support": "^0.5.16",
"spectre.css": "^0.5.9",
"vue-i18n": "^8.21.0",
"vue-the-mask": "^0.11.1",
"vuedraggable": "^2.24.1",
"vuex": "^3.5.1",
"vuex-persist": "^3.1.0"
"vuex-persist": "^3.1.3"
},
"devDependencies": {
"babel-eslint": "^10.1.0",
"cross-env": "^7.0.2",
"electron": "^10.1.0",
"electron": "^10.1.3",
"electron-builder": "^22.8.1",
"electron-devtools-installer": "^3.1.1",
"electron-webpack": "^2.8.2",
"electron-webpack-vue": "^2.4.0",
"eslint": "^7.8.1",
"eslint": "^7.10.0",
"eslint-config-standard": "^14.1.1",
"eslint-plugin-import": "^2.22.0",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^4.2.1",
"eslint-plugin-standard": "^4.0.1",
Expand All @@ -83,7 +83,7 @@
"node-sass": "^4.14.1",
"sass-loader": "^10.0.2",
"standard-version": "^9.0.0",
"stylelint": "^13.7.0",
"stylelint": "^13.7.2",
"stylelint-config-standard": "^20.0.0",
"stylelint-scss": "^3.18.0",
"vue": "^2.6.12",
Expand Down
10 changes: 4 additions & 6 deletions src/renderer/components/ModalEditConnection.vue
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@
</template>

<script>
import { mapActions, mapGetters } from 'vuex';
import { mapActions } from 'vuex';
import Connection from '@/ipc-api/Connection';
import ModalAskCredentials from '@/components/ModalAskCredentials';
import BaseToast from '@/components/BaseToast';
Expand All @@ -155,6 +155,9 @@ export default {
ModalAskCredentials,
BaseToast
},
props: {
connection: Object
},
data () {
return {
toast: {
Expand All @@ -166,11 +169,6 @@ export default {
localConnection: null
};
},
computed: {
...mapGetters({
connection: 'application/getSelectedConnection'
})
},
created () {
this.localConnection = Object.assign({}, this.connection);
window.addEventListener('keydown', this.onKey);
Expand Down
6 changes: 5 additions & 1 deletion src/renderer/components/SettingBarContext.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@
<span class="d-flex"><i class="mdi mdi-18px mdi-delete text-light pr-1" /> {{ $t('word.delete') }}</span>
</div>

<ModalEditConnection v-if="isEditModal" @close="hideEditModal" />
<ModalEditConnection
v-if="isEditModal"
:connection="contextConnection"
@close="hideEditModal"
/>
<ConfirmModal
v-if="isConfirmModal"
@confirm="confirmDeleteConnection"
Expand Down

0 comments on commit ce25cd0

Please sign in to comment.