Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-08-02 20:15:26 +02:00
Code Releases Activity

Reafctor client side (EJS) constants

Browse source
This commit is contained in:
McMatts 2018-04-20 14:38:10 +01:00
parent 8fb001422a
commit bde0091a4a
23 changed files with 118 additions and 367 deletions
Download patch file Download diff file Expand all files Collapse all files

16
gui/app/components/customize/auth-settings.js
View file

@ -9,18 +9,22 @@
//
// https://documize.com
import { equal, empty } from '@ember/object/computed';
import { computed } from '@ember/object';
import { empty } from '@ember/object/computed';
import { set } from '@ember/object';
import { copy } from '@ember/object/internals';
import { inject as service } from '@ember/service';
import Component from '@ember/component';
import constants from '../../utils/constants';
import encoding from '../../utils/encoding';
export default Component.extend({
appMeta: service(),
isDocumizeProvider: equal('authProvider', constants.AuthProvider.Documize),
isKeycloakProvider: equal('authProvider', constants.AuthProvider.Keycloak),
isDocumizeProvider: computed('authProvider', function() {
return this.get('authProvider') === this.get('constants').AuthProvider.Documize;
}),
isKeycloakProvider: computed('authProvider', function() {
return this.get('authProvider') === this.get('constants').AuthProvider.Keycloak;
}),
KeycloakUrlError: empty('keycloakConfig.url'),
KeycloakRealmError: empty('keycloakConfig.realm'),
KeycloakClientIdError: empty('keycloakConfig.clientId'),
@ -47,6 +51,7 @@ export default Component.extend({
this._super(...arguments);
let provider = this.get('authProvider');
let constants = this.get('constants');
switch (provider) {
case constants.AuthProvider.Documize:
@ -71,14 +76,17 @@ export default Component.extend({
actions: {
onDocumize() {
let constants = this.get('constants');
this.set('authProvider', constants.AuthProvider.Documize);
},
onKeycloak() {
let constants = this.get('constants');
this.set('authProvider', constants.AuthProvider.Keycloak);
},
onSave() {
let constants = this.get('constants');
let provider = this.get('authProvider');
let config = this.get('authConfig');

6
gui/app/components/document/view-content.js
View file

@ -15,11 +15,11 @@ import { inject as service } from '@ember/service';
import { computed } from '@ember/object';
import Component from '@ember/component';
import TooltipMixin from '../../mixins/tooltip';
import models from '../../utils/model';
export default Component.extend(TooltipMixin, {
documentService: service('document'),
sectionService: service('section'),
store: service(),
appMeta: service(),
link: service(),
hasPages: notEmpty('pages'),
@ -265,7 +265,7 @@ export default Component.extend(TooltipMixin, {
return;
}
let page = models.PageModel.create();
let page = this.get('store').createRecord('page');
page.set('documentId', this.get('document.id'));
page.set('title', sectionName);
page.set('contentType', section.get('contentType'));
@ -296,7 +296,7 @@ export default Component.extend(TooltipMixin, {
return;
}
let page = models.PageModel.create();
let page = this.get('store').createRecord('page');
page.set('documentId', this.get('document.id'));
page.set('title', `${block.get('title')}`);
page.set('body', block.get('body'));

15
gui/app/components/folder/space-view.js
View file

@ -36,13 +36,12 @@ export default Component.extend(AuthMixin, {
didReceiveAttrs() {
this._super(...arguments);
// this.setup();
this.setup();
},
didUpdateAttrs() {
this._super(...arguments);
// this.set('selectedDocuments', []);
// this.set('filteredDocs', []);
// this.setup();
},
setup() {
@ -65,10 +64,12 @@ export default Component.extend(AuthMixin, {
schedule('afterRender', () => {
if (this.get('categoryFilter') !== '') {
this.send('onDocumentFilter', 'category', this.get('categoryFilter'));
} else if (this.get('rootDocCount') > 0) {
} else {
this.send('onDocumentFilter', 'space', this.get('folder.id'));
} else if (selectedCategory !== '') {
this.send('onDocumentFilter', 'category', selectedCategory);
// } else if (this.get('rootDocCount') > 0) {
// this.send('onDocumentFilter', 'space', this.get('folder.id'));
// } else if (selectedCategory !== '') {
// this.send('onDocumentFilter', 'category', selectedCategory);
}
});
},
@ -148,8 +149,8 @@ export default Component.extend(AuthMixin, {
});
this.set('categoryFilter', '');
this.set('uncategorizedSelected', true);
this.set('spaceSelected', false);
this.set('uncategorizedSelected', true);
break;
case 'space':

6
gui/app/components/spaces/space-list.js
View file

@ -10,7 +10,6 @@
// https://documize.com
import Component from '@ember/component';
import constants from '../../utils/constants';
import TooltipMixin from '../../mixins/tooltip';
import NotifierMixin from '../../mixins/notifier';
import AuthMixin from '../../mixins/auth';
@ -24,10 +23,13 @@ export default Component.extend(TooltipMixin, NotifierMixin, AuthMixin, {
this._super(...arguments);
this.publicFolders = [];
this.protectedFolders = [];
this.privateFolders = [];
this.privateFolders = [];
},
didReceiveAttrs() {
this._super(...arguments);
let constants = this.get('constants');
let folders = this.get('spaces');
let publicFolders = [];
let protectedFolders = [];

4
gui/app/components/toolbar/for-space.js
View file

@ -14,7 +14,6 @@ import { computed } from '@ember/object';
import { schedule } from '@ember/runloop';
import { A } from '@ember/array';
import { inject as service } from '@ember/service';
import constants from '../../utils/constants';
import TooltipMixin from '../../mixins/tooltip';
import ModalMixin from '../../mixins/modal';
import AuthMixin from '../../mixins/auth';
@ -51,7 +50,7 @@ export default Component.extend(ModalMixin, TooltipMixin, AuthMixin, {
dropzone: null,
spaceTypeOptions: A([]),
spaceType: constants.FolderType.Private,
spaceType: 0,
likes: '',
allowLikes: false,
@ -69,6 +68,7 @@ export default Component.extend(ModalMixin, TooltipMixin, AuthMixin, {
didReceiveAttrs() {
this._super(...arguments);
let constants = this.get('constants');
let folder = this.get('space');
let targets = _.reject(this.get('spaces'), {id: folder.get('id')});

3
gui/app/components/toolbar/nav-bar.js
View file

@ -13,7 +13,6 @@ import $ from 'jquery';
import { notEmpty } from '@ember/object/computed';
import { inject as service } from '@ember/service'
import ModalMixin from '../../mixins/modal';
import constants from '../../utils/constants';
import Component from '@ember/component';
export default Component.extend(ModalMixin, {
@ -31,6 +30,8 @@ export default Component.extend(ModalMixin, {
init() {
this._super(...arguments);
let constants = this.get('constants');
this.pins = [];
if (this.get('appMeta.authProvider') === constants.AuthProvider.Keycloak) {