Skip to content

Admin: Email disabling, spinner and large page width #870

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 9, 2020
Merged

Admin: Email disabling, spinner and large page width #870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e95cc42
Remove disabling of email buttons
jvwong Oct 9, 2020
1324693
Add spinner on load
jvwong Oct 9, 2020
b5b7d8c
Remove the extremely large width of the page.
jvwong Oct 9, 2020
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
6 changes: 2 additions & 4 deletions src/client/components/document-management-components.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,16 +476,14 @@ class DocumentManagementDocumentComponent extends React.Component {
workingMessage: 'Sending...',
buttonKey: EMAIL_TYPE_INVITE,
value: EMAIL_TYPE_INVITE,
label: _.capitalize( EMAIL_TYPE_INVITE ),
disableWhen: doc.initiated() || doc.trashed()
label: _.capitalize( EMAIL_TYPE_INVITE )
}),
h( DocumentEmailButtonComponent, {
params: { doc, apiKey },
workingMessage: 'Sending...',
buttonKey: EMAIL_TYPE_FOLLOWUP,
value: EMAIL_TYPE_FOLLOWUP,
label: _.upperFirst( EMAIL_TYPE_FOLLOWUP.replace(/([A-Z])/g, (match, letter) => '-' + letter) ),
disableWhen: doc.initiated() || doc.trashed()
label: _.upperFirst( EMAIL_TYPE_FOLLOWUP.replace(/([A-Z])/g, (match, letter) => '-' + letter) )
})
]);
}
Expand Down
33 changes: 23 additions & 10 deletions src/client/components/document-management.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { DocumentManagementDocumentComponent } from './document-management-compo
import logger from '../logger';
import DirtyComponent from './dirty-component';
import Document from '../../model/document';
import { tryPromise } from '../../util';
import { makeClassList, tryPromise } from '../../util';
import Popover from './popover/popover';
import { checkHTTPStatus } from '../../util';
import { RequestForm } from './home';
Expand Down Expand Up @@ -63,7 +63,8 @@ class DocumentManagement extends DirtyComponent {
status,
pageCount: 0,
limit: 10,
offset: 0
offset: 0,
isLoading: false
};

this.bus = new EventEmitter();
Expand Down Expand Up @@ -100,6 +101,8 @@ class DocumentManagement extends DirtyComponent {
const url = '/api/document';
const params = this.getUrlParams();

this.setState({ isLoading: true });

return fetch(`${url}?${params}`)
.then( res => {
const total = res.headers.get('X-Document-Count');
Expand All @@ -112,7 +115,10 @@ class DocumentManagement extends DirtyComponent {
return docs;
})
.then( docs => new Promise( resolve => this.setState( { docs }, resolve ) ) )
.then( () => this.updateUrlParams() );
.then( () => this.updateUrlParams() )
.finally( () => {
new Promise( resolve => this.setState( { isLoading: false }, resolve ) );
});
}

handleApiKeyFormChange( apiKey ) {
Expand Down Expand Up @@ -151,7 +157,7 @@ class DocumentManagement extends DirtyComponent {
}

render(){
let { docs, apiKey, status, validApiKey } = this.state;
let { docs, apiKey, status, validApiKey, isLoading } = this.state;
const header = h('div.page-content-title', [
h('h1', 'Document management panel')
]);
Expand Down Expand Up @@ -228,15 +234,22 @@ class DocumentManagement extends DirtyComponent {
})
);

const documentContainer = h( 'div.document-management-document-container', [
documentMenu,
documentList
]);

const documentContainer = h( 'div.document-management-document-container',
[
h('i.icon.icon-spinner.document-management-spinner', {
className: makeClassList({ 'document-management-hidden': !isLoading })
}),
h('div', {
className: makeClassList({ 'document-management-hidden': isLoading })
}, [documentMenu, documentList])
]
);

let body = validApiKey ? documentContainer: apiKeyForm;

const footer = h('div.document-management-footer', [
const footer = h('div.document-management-footer', {
className: makeClassList({ 'document-management-hidden': isLoading })
}, [
h( 'div.document-management-paginator', [
h( ReactPaginate, {
pageCount: this.state.pageCount,
Expand Down
15 changes: 14 additions & 1 deletion src/styles/document-management.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.document-management {
& input,
& textarea {
width: 100%;
max-width: 100%;
margin-bottom: 1em;
}

Expand All @@ -27,6 +27,10 @@
}
}

.document-management-hidden {
display: none;
}

.document-management-document-container {
width: 100%;

Expand All @@ -50,6 +54,15 @@
}
}

.document-management-spinner {
margin: 0;
position: absolute;
top: 50%;
left: 50%;
margin-right: -50%;
transform: translate(-50%, -50%);
}

.document-management-document-control-menu-item {
margin-bottom: 5px;
}
Expand Down