From b6f4aef7ef92e7f3e1735547f958bdbf9dd3ba45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ahmet=20=C3=87otur?= Date: Thu, 9 Jul 2020 14:53:11 +0300 Subject: [PATCH] Tenant Management - prettier settings added and js files reformatted --- modules/tenant-management/.prettierrc | 4 + .../Tenants/ConnectionStringsModal.js | 34 ++-- .../Pages/TenantManagement/Tenants/Index.js | 185 ++++++++++-------- 3 files changed, 120 insertions(+), 103 deletions(-) create mode 100644 modules/tenant-management/.prettierrc diff --git a/modules/tenant-management/.prettierrc b/modules/tenant-management/.prettierrc new file mode 100644 index 0000000000..7d1b8aa721 --- /dev/null +++ b/modules/tenant-management/.prettierrc @@ -0,0 +1,4 @@ +{ + "singleQuote": true, + "useTabs": true +} diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/ConnectionStringsModal.js b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/ConnectionStringsModal.js index b72d2b3505..0fdba0a660 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/ConnectionStringsModal.js +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/ConnectionStringsModal.js @@ -1,20 +1,18 @@ (function ($) { + abp.modals.TenantConnectionStringManagement = function () { + var initModal = function (publicApi, args) { + publicApi + .getModal() + .find('input[name="Tenant.UseSharedDatabase"]') + .change(function () { + var $this = $(this); + $('#Tenant_DefaultConnectionString_Wrap').toggleClass('d-none'); + $this.val($this.prop('checked')); + }); + }; - abp.modals.TenantConnectionStringManagement = function() { - - var initModal = function (publicApi, args) { - publicApi.getModal() - .find('input[name="Tenant.UseSharedDatabase"]') - .change(function () { - var $this = $(this); - $("#Tenant_DefaultConnectionString_Wrap").toggleClass("d-none"); - $this.val($this.prop("checked")); - }); - }; - - return { - initModal: initModal - }; - }; - -})(jQuery); \ No newline at end of file + return { + initModal: initModal, + }; + }; +})(jQuery); diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.js b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.js index 0dc1861790..c3f00dcd24 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.js +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.js @@ -1,93 +1,108 @@ (function () { + var l = abp.localization.getResource('AbpTenantManagement'); + var _tenantAppService = volo.abp.tenantManagement.tenant; - var l = abp.localization.getResource('AbpTenantManagement'); - var _tenantAppService = volo.abp.tenantManagement.tenant; + var _editModal = new abp.ModalManager( + abp.appPath + 'TenantManagement/Tenants/EditModal' + ); + var _createModal = new abp.ModalManager( + abp.appPath + 'TenantManagement/Tenants/CreateModal' + ); + var _featuresModal = new abp.ModalManager( + abp.appPath + 'FeatureManagement/FeatureManagementModal' + ); + var _connectionStringsModal = new abp.ModalManager({ + viewUrl: abp.appPath + 'TenantManagement/Tenants/ConnectionStringsModal', + modalClass: 'TenantConnectionStringManagement', + }); - var _editModal = new abp.ModalManager(abp.appPath + 'TenantManagement/Tenants/EditModal'); - var _createModal = new abp.ModalManager(abp.appPath + 'TenantManagement/Tenants/CreateModal'); - var _featuresModal = new abp.ModalManager(abp.appPath + 'FeatureManagement/FeatureManagementModal'); - var _connectionStringsModal = new abp.ModalManager({ - viewUrl: abp.appPath + 'TenantManagement/Tenants/ConnectionStringsModal', - modalClass: 'TenantConnectionStringManagement' - }); + $(function () { + var _$wrapper = $('#TenantsWrapper'); - $(function () { + var _dataTable = _$wrapper.find('table').DataTable( + abp.libs.datatables.normalizeConfiguration({ + order: [[1, 'asc']], + processing: true, + paging: true, + scrollX: true, + serverSide: true, + ajax: abp.libs.datatables.createAjax(_tenantAppService.getList), + columnDefs: [ + { + rowAction: { + items: [ + { + text: l('Edit'), + visible: abp.auth.isGranted( + 'AbpTenantManagement.Tenants.Update' + ), + action: function (data) { + _editModal.open({ + id: data.record.id, + }); + }, + }, + { + text: l('ConnectionStrings'), + visible: abp.auth.isGranted( + 'AbpTenantManagement.Tenants.ManageConnectionStrings' + ), + action: function (data) { + _connectionStringsModal.open({ + id: data.record.id, + }); + }, + }, + { + text: l('Features'), + visible: abp.auth.isGranted( + 'AbpTenantManagement.Tenants.ManageFeatures' + ), + action: function (data) { + _featuresModal.open({ + providerName: 'T', + providerKey: data.record.id, + }); + }, + }, + { + text: l('Delete'), + visible: abp.auth.isGranted( + 'AbpTenantManagement.Tenants.Delete' + ), + confirmMessage: function (data) { + return l( + 'TenantDeletionConfirmationMessage', + data.record.name + ); + }, + action: function (data) { + _tenantAppService.delete(data.record.id).then(function () { + _dataTable.ajax.reload(); + }); + }, + }, + ], + }, + }, + { + data: 'name', + }, + ], + }) + ); - var _$wrapper = $('#TenantsWrapper'); + _createModal.onResult(function () { + _dataTable.ajax.reload(); + }); - var _dataTable = _$wrapper.find('table').DataTable(abp.libs.datatables.normalizeConfiguration({ - order: [[1, "asc"]], - processing: true, - paging: true, - scrollX: true, - serverSide: true, - ajax: abp.libs.datatables.createAjax(_tenantAppService.getList), - columnDefs: [ - { - rowAction: { - items: - [ - { - text: l('Edit'), - visible: abp.auth.isGranted('AbpTenantManagement.Tenants.Update'), - action: function (data) { - _editModal.open({ - id: data.record.id - }); - } - }, - { - text: l('ConnectionStrings'), - visible: abp.auth.isGranted('AbpTenantManagement.Tenants.ManageConnectionStrings'), - action: function (data) { - _connectionStringsModal.open({ - id: data.record.id - }); - } - }, - { - text: l('Features'), - visible: abp.auth.isGranted('AbpTenantManagement.Tenants.ManageFeatures'), - action: function (data) { - _featuresModal.open({ - providerName: 'T', - providerKey: data.record.id - }); - } - }, - { - text: l('Delete'), - visible: abp.auth.isGranted('AbpTenantManagement.Tenants.Delete'), - confirmMessage: function (data) { return l('TenantDeletionConfirmationMessage', data.record.name)}, - action: function (data) { - _tenantAppService - .delete(data.record.id) - .then(function () { - _dataTable.ajax.reload(); - }); - } - } - ] - } - }, - { - data: "name" - } - ] - })); - - _createModal.onResult(function () { - _dataTable.ajax.reload(); - }); - - _editModal.onResult(function () { - _dataTable.ajax.reload(); - }); - - _$wrapper.find('button[name=CreateTenant]').click(function (e) { - e.preventDefault(); - _createModal.open(); - }); - }); + _editModal.onResult(function () { + _dataTable.ajax.reload(); + }); + _$wrapper.find('button[name=CreateTenant]').click(function (e) { + e.preventDefault(); + _createModal.open(); + }); + }); })();