Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-08 22:18:28 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup admin code

Browse source
This commit is contained in:
djmaze 2021-04-22 21:56:01 +02:00
parent 75c879836c
commit 3572d00a10
16 changed files with 178 additions and 244 deletions
Download patch file Download diff file Expand all files Collapse all files

40
dev/Settings/Admin/Contacts.js
View file

@ -105,8 +105,6 @@ export class ContactsAdminSettings {
})
})
this.onTestContactsResponse = this.onTestContactsResponse.bind(this);
decorateKoCommands(this, {
testContactsCommand: self => self.pdoDsn() && self.pdoUser()
});
@ -118,7 +116,24 @@ export class ContactsAdminSettings {
this.testContactsErrorMessage('');
this.testing(true);
Remote.testContacts(this.onTestContactsResponse, {
Remote.testContacts((iError, data) => {
this.testContactsSuccess(false);
this.testContactsError(false);
this.testContactsErrorMessage('');
if (!iError && data.Result.Result) {
this.testContactsSuccess(true);
} else {
this.testContactsError(true);
if (data && data.Result) {
this.testContactsErrorMessage(data.Result.Message || '');
} else {
this.testContactsErrorMessage('');
}
}
this.testing(false);
}, {
ContactsPdoType: this.contactsType(),
ContactsPdoDsn: this.pdoDsn(),
ContactsPdoUser: this.pdoUser(),
@ -126,25 +141,6 @@ export class ContactsAdminSettings {
});
}
onTestContactsResponse(iError, data) {
this.testContactsSuccess(false);
this.testContactsError(false);
this.testContactsErrorMessage('');
if (!iError && data.Result.Result) {
this.testContactsSuccess(true);
} else {
this.testContactsError(true);
if (data && data.Result) {
this.testContactsErrorMessage(data.Result.Message || '');
} else {
this.testContactsErrorMessage('');
}
}
this.testing(false);
}
onShow() {
this.testContactsSuccess(false);
this.testContactsError(false);

23
dev/Settings/Admin/Domains.js
View file

@ -13,9 +13,6 @@ export class DomainsAdminSettings {
this.domains = DomainAdminStore;
this.domainForDeletion = ko.observable(null).deleteAccessHelper();
this.onDomainListChangeRequest = this.onDomainListChangeRequest.bind(this);
this.onDomainLoadRequest = this.onDomainLoadRequest.bind(this);
}
createDomain() {
@ -28,30 +25,22 @@ export class DomainsAdminSettings {
deleteDomain(domain) {
DomainAdminStore.remove(domain);
Remote.domainDelete(this.onDomainListChangeRequest, domain.name);
Remote.domainDelete(DomainAdminStore.fetch, domain.name);
}
disableDomain(domain) {
domain.disabled(!domain.disabled());
Remote.domainDisable(this.onDomainListChangeRequest, domain.name, domain.disabled());
Remote.domainDisable(DomainAdminStore.fetch, domain.name, domain.disabled());
}
onBuild(oDom) {
oDom.addEventListener('click', event => {
let el = event.target.closestWithin('.b-admin-domains-list-table .e-item .e-action', oDom);
el && ko.dataFor(el) && Remote.domain(this.onDomainLoadRequest, ko.dataFor(el).name);
let el = event.target.closestWithin('.b-admin-domains-list-table .e-action', oDom);
el && ko.dataFor(el) && Remote.domain(
(iError, oData) => iError || showScreenPopup(DomainPopupView, [oData.Result]), ko.dataFor(el).name
);
});
DomainAdminStore.fetch();
}
onDomainLoadRequest(iError, oData) {
if (!iError) {
showScreenPopup(DomainPopupView, [oData.Result]);
}
}
onDomainListChangeRequest() {
DomainAdminStore.fetch();
}
}

44
dev/Settings/Admin/Plugins.js
View file

@ -12,16 +12,14 @@ import Remote from 'Remote/Admin/Fetch';
import { PluginPopupView } from 'View/Popup/Plugin';
export class PluginsAdminSettings {
export class PluginsAdminSettings
{
constructor() {
this.enabledPlugins = ko.observable(!!SettingsGet('EnabledPlugins'));
this.plugins = PluginAdminStore;
this.pluginsError = PluginAdminStore.error;
this.onPluginLoadRequest = this.onPluginLoadRequest.bind(this);
this.onPluginDisableRequest = this.onPluginDisableRequest.bind(this);
this.enabledPlugins.subscribe(value =>
Remote.saveAdminConfig(null, {
EnabledPlugins: value ? 1 : 0
@ -30,20 +28,30 @@ export class PluginsAdminSettings {
}
disablePlugin(plugin) {
plugin.disabled(!plugin.disabled());
Remote.pluginDisable(this.onPluginDisableRequest, plugin.name, plugin.disabled());
let b = !plugin.disabled();
plugin.disabled(b);
Remote.pluginDisable((iError, data) => {
if (iError) {
PluginAdminStore.error(
(Notification.UnsupportedPluginPackage === iError && data && data.ErrorMessage)
? data.ErrorMessage
: getNotification(iError)
);
}
PluginAdminStore.fetch();
}, plugin.name, b);
}
configurePlugin(plugin) {
Remote.plugin(this.onPluginLoadRequest, plugin.name);
Remote.plugin((iError, data) => iError || showScreenPopup(PluginPopupView, [data.Result]), plugin.name);
}
onBuild(oDom) {
oDom.addEventListener('click', event => {
let el = event.target.closestWithin('.e-item .configure-plugin-action', oDom);
let el = event.target.closestWithin('.configure-plugin-action', oDom);
el && ko.dataFor(el) && this.configurePlugin(ko.dataFor(el));
el = event.target.closestWithin('.e-item .disabled-plugin', oDom);
el = event.target.closestWithin('.disabled-plugin', oDom);
el && ko.dataFor(el) && this.disablePlugin(ko.dataFor(el));
});
}
@ -52,22 +60,4 @@ export class PluginsAdminSettings {
PluginAdminStore.error('');
PluginAdminStore.fetch();
}
onPluginLoadRequest(iError, data) {
if (!iError) {
showScreenPopup(PluginPopupView, [data.Result]);
}
}
onPluginDisableRequest(iError, data) {
if (iError) {
if (Notification.UnsupportedPluginPackage === iError && data && data.ErrorMessage) {
PluginAdminStore.error(data.ErrorMessage);
} else {
PluginAdminStore.error(getNotification(iError));
}
}
PluginAdminStore.fetch();
}
}

30
dev/Settings/Admin/Security.js
View file

@ -72,8 +72,6 @@ export class SecurityAdminSettings {
})
});
this.onNewAdminPasswordResponse = this.onNewAdminPasswordResponse.bind(this);
decorateKoCommands(this, {
saveNewAdminPasswordCommand: self => self.adminLogin().trim() && self.adminPassword()
});
@ -93,7 +91,19 @@ export class SecurityAdminSettings {
this.adminPasswordUpdateError(false);
this.adminPasswordUpdateSuccess(false);
Remote.saveNewAdminPassword(this.onNewAdminPasswordResponse, {
Remote.saveNewAdminPassword((iError, data) => {
if (iError) {
this.adminPasswordUpdateError(true);
} else {
this.adminPassword('');
this.adminPasswordNew('');
this.adminPasswordNew2('');
this.adminPasswordUpdateSuccess(true);
this.weakPassword(!!data.Result.Weak);
}
}, {
'Login': this.adminLogin(),
'Password': this.adminPassword(),
'NewPassword': this.adminPasswordNew()
@ -102,20 +112,6 @@ export class SecurityAdminSettings {
return true;
}
onNewAdminPasswordResponse(iError, data) {
if (iError) {
this.adminPasswordUpdateError(true);
} else {
this.adminPassword('');
this.adminPasswordNew('');
this.adminPasswordNew2('');
this.adminPasswordUpdateSuccess(true);
this.weakPassword(!!data.Result.Weak);
}
}
onHide() {
this.adminPassword('');
this.adminPasswordNew('');

77
dev/Styles/AdminDomains.less
View file

@ -3,54 +3,49 @@
width: 600px;
.e-item {
.domain-name {
display: inline-block;
word-break: break-all;
box-sizing: border-box;
}
.domain-name {
display: inline-block;
word-break: break-all;
box-sizing: border-box;
.domain-alias {
display: inline-block;
box-sizing: border-box;
color: #bbb;
padding-left: 5px;
}
.button-delete {
position: relative;
right: 0;
visibility: hidden;
opacity: 0;
white-space: nowrap;
&.delete-access {
visibility: visible;
right: -15px;
opacity: 1;
}
}
.domain-alias {
display: inline-block;
box-sizing: border-box;
.delete-domain, .disabled-domain {
cursor: pointer;
opacity: 0.5;
&:hover {
opacity: 1;
}
}
&.disabled {
.domain-name, .domain-alias {
color: #bbb;
padding-left: 5px;
}
&.disabled {
.domain-name, .domain-alias {
color: #bbb;
}
}
.button-delete {
margin-right: 15px;
visibility: hidden;
opacity: 0;
}
.delete-access {
&.button-delete {
visibility: visible;
margin-right: 0;
opacity: 1;
}
}
.delete-domain, .disabled-domain {
cursor: pointer;
.disabled-domain {
opacity: 0.5;
}
&.disabled .disabled-domain {
opacity: 0.5;
}
.delete-domain, .disabled-domain {
&:hover {
opacity: 1;
}
}
}
}

35
dev/Styles/AdminPackages.less
View file

@ -11,26 +11,23 @@
width: 700px;
.e-item {
.package-img {
font-size: 12px;
margin-right: 2px;
}
.package-img {
font-size: 12px;
margin-right: 2px;
}
.package-name.core {
font-weight: bold;
}
.package-desc {
color: #999;
font-size: 12px;
}
.package-name.core {
font-weight: bold;
}
.package-desc {
color: #999;
font-size: 12px;
}
.package-release, .package-actions {
text-align: center;
}
.package-actions {
vertical-align: middle;
}
.package-release, .package-actions {
text-align: center;
}
.package-actions {
vertical-align: middle;
}
}

18
dev/Styles/AdminPlugins.less
View file

@ -1,25 +1,13 @@
.b-admin-plugins-list-table {
max-width: 620px; /* span8 */
&.disabled {
opacity: 0.5;
background-color: #eee;
}
.e-item {
.plugin-img {
font-size: 12px;
margin-right: 2px;
}
&.disabled {
.plugin-img, .plugin-name {
color: #bbb;
}
.disabled-plugin {
opacity: 0.5;
}
}
.disabled {
opacity: 0.5;
}
}

2
dev/View/User/Settings/Menu.js
View file

@ -21,7 +21,7 @@ export class MenuSettingsUserView extends AbstractViewLeft {
onBuild(dom) {
dom.addEventListener('click', event =>
ThemeStore.isMobile()
&& event.target.closest('.b-settings-menu a', dom)
&& event.target.closestWithin('.b-settings-menu a', dom)
&& leftPanelDisabled(true)
);
}

8
snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsContacts.html
View file

@ -95,12 +95,6 @@ host=127.0.0.1;port=5432;dbname=snappymail
</div>
</div>
</div>
<div class="control-group" data-bind="visible: '' !== testContactsErrorMessage()">
<div class="controls">
<div class="row">
<div class="alert span8" data-bind="text: testContactsErrorMessage"></div>
</div>
</div>
</div>
<div class="alert span8" data-bind="text: testContactsErrorMessage, visible: '' !== testContactsErrorMessage()"></div>
</div>
</div>

18
snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsDomainListItem.html
View file

@ -1,18 +0,0 @@
<tr class="e-item" data-bind="css: {'disabled': disabled }">
<td class="e-action">
<span class="domain-name" data-bind="text: name"></span>
<span class="domain-alias" data-bind="if: alias">(alias)</span>
</td>
<td>
<a class="btn btn-small btn-small-small btn-danger pull-right button-delete button-delete-transitions" data-bind="css: {'delete-access': deleteAccess()}, click: function(oDomain) { $root.deleteDomain(oDomain); }"
data-i18n="TAB_DOMAINS/DELETE_ARE_YOU_SURE"></a>
</td>
<td>
<span class="delete-domain" data-bind="visible: !deleteAccess(), click: function (oDomain) { $root.domainForDeletion(oDomain); }">
<i class="fontastic">🗑</i>
</span>
</td>
<td>
<span class="disabled-domain fontastic" data-bind="click: function (oDomain) { $root.disableDomain(oDomain); }, text: disabled() ? '☐' : '☑'"></span>
</td>
</tr>

17
snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsDomains.html
View file

@ -25,7 +25,22 @@
<col style="width: 1%" />
<col style="width: 1%" />
</colgroup>
<tbody data-bind="template: { name: 'AdminSettingsDomainListItem', foreach: domains }"></tbody>
<tbody data-bind="foreach: domains">
<tr data-bind="css: {'disabled': disabled }">
<td class="e-action">
<span class="domain-name" data-bind="text: name"></span>
<span class="domain-alias" data-bind="if: alias">(alias)</span>
</td>
<td>
<a class="btn btn-small btn-small-small btn-danger button-delete button-delete-transitions" data-bind="css: {'delete-access': deleteAccess()}, click: function(oDomain) { $root.deleteDomain(oDomain); }"
data-i18n="TAB_DOMAINS/DELETE_ARE_YOU_SURE"></a>
</td>
<td>
<span class="delete-domain fontastic" data-bind="visible: !deleteAccess(), click: function (oDomain) { $root.domainForDeletion(oDomain); }">🗑</span>
</td>
<td class="disabled-domain fontastic" data-bind="click: function (oDomain) { $root.disableDomain(oDomain); }, text: disabled() ? '☐' : '☑'"></td>
</tr>
</tbody>
</table>
</div>
</div>

19
snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPackagesListItem.html
View file

@ -1,19 +0,0 @@
<tr class="e-item">
<td>
<span class="package-name" data-bind="text: name"></span>
<span class="package-installed pull-right" data-bind="text: installed"></span>
<div class="package-desc" data-bind="text: desc"></div>
</td>
<td>
<span class="package-version" data-bind="text: version"></span>
</td>
<!--
<td class="package-release" data-bind="text: release"></td>
-->
<td class="package-actions">
<i class="icon-download e-action button-download" data-bind="visible: !loading() && canBeUpdated, click: function () { $root.installPackage($data); }"></i>
&nbsp;
<i class="fontastic e-action button-delete" data-bind="visible: !loading() && canBeDeleted, click: function () { $root.deletePackage($data); }">🗑</i>
<i class="icon-spinner" data-bind="visible: loading"></i>
</td>
</tr>

22
snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPackagesTable.html
View file

@ -5,5 +5,23 @@
<!-- <col style="width: 100px" /> -->
<col style="width: 80px" />
</colgroup>
<tbody data-bind="template: { name: 'AdminSettingsPackagesListItem', foreach: f }"></tbody>
</table>
<tbody data-bind="foreach: f">
<tr>
<td>
<span class="package-name" data-bind="text: name"></span>
<span class="package-installed pull-right" data-bind="text: installed"></span>
<div class="package-desc" data-bind="text: desc"></div>
</td>
<td class="package-version" data-bind="text: version"></td>
<!--
<td class="package-release" data-bind="text: release"></td>
-->
<td class="package-actions">
<i class="icon-download e-action button-download" data-bind="visible: !loading() && canBeUpdated, click: function () { $root.installPackage($data); }"></i>
&nbsp;
<i class="fontastic e-action button-delete" data-bind="visible: !loading() && canBeDeleted, click: function () { $root.deletePackage($data); }">🗑</i>
<i class="icon-spinner" data-bind="visible: loading"></i>
</td>
</tr>
</tbody>
</table>

4
snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPluginListItem.html
View file

@ -1,4 +0,0 @@
<tr class="e-item" data-bind="css: {'disabled': disabled }">
<td class="configure-plugin-action e-action plugin-name" data-bind="text: name"></td>
<td class="disabled-plugin e-action fontastic" data-bind="text: disabled() ? '☐' : '☑'"></td>
</tr>

4
snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPluginProperty.html
View file

@ -1,7 +1,5 @@
<div class="b-admin-plugin-property">
<label class="control-label">
<span data-bind="text: Label, visible: 5 !== Type"></span>
</label>
<label class="control-label" data-bind="text: Label, visible: 5 !== Type"></label>
<div class="controls">
<!-- ko if: 0 === Type -->
<input type="text" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"

61
snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPlugins.html
View file

@ -1,10 +1,8 @@
<div class="b-admin-plugins g-ui-user-select-none">
<div class="row">
<div class="alert span8" style="margin-top: 10px;" data-bind="visible: '' !== pluginsError()">
<button type="button" class="close" data-bind="click: function () { pluginsError('') }">×</button>
<span data-bind="text: pluginsError"></span>
</div>
<div class="alert" style="margin-top: 10px;" data-bind="visible: '' !== pluginsError()">
<button type="button" class="close" data-bind="click: function () { pluginsError('') }">×</button>
<span data-bind="text: pluginsError"></span>
</div>
<div class="legend">
@ -12,33 +10,34 @@
<i class="icon-spinner" style="margin: 5px" data-bind="visible: plugins.loading"></i>
</div>
<div>
<div data-bind="component: {
name: 'Checkbox',
params: { value: enabledPlugins, label: 'TAB_PLUGINS/LABEL_ENABLE_PLUGINS' }
}"></div>
</div>
<div data-bind="component: {
name: 'Checkbox',
params: { value: enabledPlugins, label: 'TAB_PLUGINS/LABEL_ENABLE_PLUGINS' }
}"></div>
<br />
<div class="row">
<div class="alert alert-info span8" data-bind="visible: 0 === plugins().length">
<span data-i18n="TAB_PLUGINS/ALERT_NO_PLUGINS"></span>
<br />
<br />
<strong><a href="#/packages" data-i18n="TAB_PLUGINS/LINK_INSTALL_NEW"></a></strong>
</div>
<div class="span8" data-bind="visible: 0 < plugins().length">
<blockquote><p class="muted" data-i18n="TAB_PLUGINS/HINT_CLICK_NAME"></p></blockquote>
</div>
<div class="alert alert-info" data-bind="visible: 0 === plugins().length">
<span data-i18n="TAB_PLUGINS/ALERT_NO_PLUGINS"></span>
<br />
<br />
<strong><a href="#/packages" data-i18n="TAB_PLUGINS/LINK_INSTALL_NEW"></a></strong>
</div>
<div class="row">
<div class="span8">
<table class="table table-hover b-admin-plugins-list-table" data-bind="i18nUpdate: plugins, visible: 0 < plugins().length, css: {'disabled': !enabledPlugins()}">
<colgroup>
<col />
<col style="width: 30px" />
</colgroup>
<tbody data-bind="template: { name: 'AdminSettingsPluginListItem', foreach: plugins }"></tbody>
</table>
</div>
<div data-bind="visible: 0 < plugins().length">
<blockquote><p class="muted" data-i18n="TAB_PLUGINS/HINT_CLICK_NAME"></p></blockquote>
</div>
<table class="table table-hover b-admin-plugins-list-table" data-bind="i18nUpdate: plugins, visible: 0 < plugins().length, css: {'disabled': !enabledPlugins()}">
<colgroup>
<col />
<col style="width: 30px" />
</colgroup>
<tbody data-bind="foreach: plugins">
<tr data-bind="css: {'disabled': disabled }">
<td class="configure-plugin-action e-action plugin-name" data-bind="text: name"></td>
<td class="disabled-plugin e-action fontastic" data-bind="text: disabled() ? '☐' : '☑'"></td>
</tr>
</tbody>
</table>
</div>