Skip to content

Commit dc2ff91

Browse files
author
Saket Hatwar
committed
Formatting
1 parent 3d0e81c commit dc2ff91

File tree

6 files changed

+123
-66
lines changed

6 files changed

+123
-66
lines changed

‎modules/document_repository/jsx/categoryForm.js‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,11 @@ class DocCategoryForm extends React.Component {
7171
* @return {JSX} - React markup for the component
7272
*/
7373
render() {
74-
const { t } = this.props;
74+
const {t} = this.props;
7575
// Data loading error
7676
if (this.state.error) {
77-
return <h3>{t('An error occured while loading the page.', {ns: 'document_repository'})}</h3>;
77+
return <h3>{t('An error occured while loading the page.',
78+
{ns: 'document_repository'})}</h3>;
7879
}
7980
// Waiting for data to load
8081
if (!this.state.isLoaded) {
@@ -85,7 +86,8 @@ class DocCategoryForm extends React.Component {
8586
let addButton = null;
8687
if (loris.userHasPermission('document_repository_categories')) {
8788
disabled = false;
88-
addButton = <ButtonElement label={t('Add Category', {ns: 'document_repository'})}/>;
89+
addButton = <ButtonElement label={t('Add Category',
90+
{ns: 'document_repository'})}/>;
8991
}
9092

9193
return (
@@ -96,10 +98,12 @@ class DocCategoryForm extends React.Component {
9698
fileUpload={true}
9799
onSubmit={this.handleSubmit}
98100
>
99-
<h3>{t('Add a category', {ns: 'document_repository'})}</h3><br/>
101+
<h3>{t('Add a category',
102+
{ns: 'document_repository'})}</h3><br/>
100103
<TextboxElement
101104
name="categoryName"
102-
label={t('Category Name', {ns: 'document_repository'})}
105+
label={t('Category Name',
106+
{ns: 'document_repository'})}
103107
onUserInput={this.setFormData}
104108
required={true}
105109
disabled={disabled}
@@ -171,10 +175,12 @@ class DocCategoryForm extends React.Component {
171175
this.setState({
172176
formData: {}, // reset form data after successful file upload
173177
});
174-
swal.fire('Category Successfully Added!', '', 'success');
178+
swal.fire('Category Successfully Added!',
179+
'', 'success');
175180
} else {
176181
resp.json().then((data) => {
177-
swal.fire('Could not add category!', data.error, 'error');
182+
swal.fire('Could not add category!',
183+
data.error, 'error');
178184
}).catch((error) => {
179185
console.error(error);
180186
swal.fire(
@@ -211,4 +217,5 @@ DocCategoryForm.propTypes = {
211217

212218
i18n.addResourceBundle('hi', 'document_repository', hiStrings);
213219

214-
export default withTranslation(['document_repository', 'loris'])(DocCategoryForm);
220+
export default withTranslation(
221+
['document_repository', 'loris'])(DocCategoryForm);

‎modules/document_repository/jsx/deleteCategoryForm.js‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,11 @@ class DeleteDocCategoryForm extends React.Component {
6868
* @return {JSX} - React markup for the component
6969
*/
7070
render() {
71-
const { t } = this.props;
71+
const {t} = this.props;
7272
// Data loading error
7373
if (this.state.error) {
74-
return <h3>{t('An error occured while loading the page.', {ns: 'document_repository'})}</h3>;
74+
return <h3>{t('An error occured while loading the page.',
75+
{ns: 'document_repository'})}</h3>;
7576
}
7677
// Waiting for data to load
7778
if (!this.state.isLoaded) {
@@ -82,7 +83,8 @@ class DeleteDocCategoryForm extends React.Component {
8283
let deleteButton = null;
8384
if (loris.userHasPermission('document_repository_categories')) {
8485
disabled = false;
85-
deleteButton = <ButtonElement label={t('Delete Category', {ns: 'document_repository'})}/>;
86+
deleteButton = <ButtonElement label={t('Delete Category',
87+
{ns: 'document_repository'})}/>;
8688
}
8789

8890
return (
@@ -130,7 +132,7 @@ class DeleteDocCategoryForm extends React.Component {
130132
* Delete the Category.
131133
*/
132134
deleteCategory() {
133-
const { t } = this.props;
135+
const {t} = this.props;
134136
let formData = this.state.formData;
135137
let formObj = new FormData();
136138
for (let key in formData) {
@@ -169,7 +171,8 @@ class DeleteDocCategoryForm extends React.Component {
169171
});
170172
}
171173
}).catch( (error) => {
172-
let msg = error.message ? error.message : t('Delete error!', {ns: 'document_repository'});
174+
let msg = error.message ? error.message : t('Delete error!',
175+
{ns: 'document_repository'});
173176
this.setState({
174177
errorMessage: msg,
175178
uploadProgress: -1,
@@ -200,4 +203,5 @@ DeleteDocCategoryForm.propTypes = {
200203

201204
i18n.addResourceBundle('hi', 'document_repository', hiStrings);
202205

203-
export default withTranslation(['document_repository', 'loris'])(DeleteDocCategoryForm);
206+
export default withTranslation(
207+
['document_repository', 'loris'])(DeleteDocCategoryForm);

‎modules/document_repository/jsx/docIndex.js‎

Lines changed: 41 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -174,29 +174,34 @@ class DocIndex extends React.Component {
174174
* @return {*} a formated table cell for a given column
175175
*/
176176
formatColumn(column, cell, row) {
177-
const { t } = this.props;
177+
const {t} = this.props;
178178
let result = <td>{cell}</td>;
179179
switch (column) {
180180
case t('File Name', {ns: 'document_repository'}):
181181
let downloadURL = loris.BaseURL
182182
+ '/document_repository/Files/'
183-
+ encodeURIComponent(row[t('Uploaded By', {ns: 'document_repository'})])
183+
+ encodeURIComponent(row[t('Uploaded By',
184+
{ns: 'document_repository'})])
184185
+ '/'
185-
+ encodeURIComponent(row[t('File Name', {ns: 'document_repository'})]);
186+
+ encodeURIComponent(row[t('File Name',
187+
{ns: 'document_repository'})]);
186188
result = <td>
187189
<a
188190
href={downloadURL}
189191
target="_blank"
190-
download={encodeURIComponent(row[t('File Name', {ns: 'document_repository'})])}
192+
download={encodeURIComponent(row[t('File Name',
193+
{ns: 'document_repository'})])}
191194
>
192195
{cell}
193196
</a>
194197
</td>;
195198
break;
196199
case t('Edit', {ns: 'document_repository'}):
197200
let editURL = loris.BaseURL
198-
+ '/document_repository/edit/' + row[t('Edit', {ns: 'document_repository'})];
199-
result = <td><a href={editURL}>{t('Edit', {ns: 'document_repository'})}</a></td>;
201+
+ '/document_repository/edit/'
202+
+ row[t('Edit', {ns: 'document_repository'})];
203+
result = <td><a href={editURL}>{t('Edit',
204+
{ns: 'document_repository'})}</a></td>;
200205
break;
201206
case t('Delete File', {ns: 'document_repository'}):
202207
let id = row[t('Edit', {ns: 'document_repository'})];
@@ -207,12 +212,14 @@ class DocIndex extends React.Component {
207212
function click() {
208213
swal.fire({
209214
title: t('Are you sure?', {ns: 'document_repository'}),
210-
text: t('You won\'t be able to revert this!', {ns: 'document_repository'}),
215+
text: t('You won\'t be able to revert this!',
216+
{ns: 'document_repository'}),
211217
type: 'warning',
212218
showCancelButton: true,
213219
confirmButtonColor: '#3085d6',
214220
cancelButtonColor: '#d33',
215-
confirmButtonText: t('Yes, delete it!', {ns: 'document_repository'}),
221+
confirmButtonText: t('Yes, delete it!',
222+
{ns: 'document_repository'}),
216223
}).then((result) => {
217224
if (result.value) {
218225
let deleteurl = loris.BaseURL + '/document_repository/Files/' + id;
@@ -223,14 +230,17 @@ class DocIndex extends React.Component {
223230
}).then((resp) => resp.json())
224231
.then(()=>{
225232
location.reload();
226-
swal.fire(t('Delete Successful!', {ns: 'document_repository'}), '', 'success');
233+
swal.fire(t('Delete Successful!',
234+
{ns: 'document_repository'}), '', 'success');
227235
});
228236
}
229237
});
230238
}
231239

232240
result = <td>
233-
<a style={{cursor: 'pointer'}} onClick={click}>{t('Delete', {ns: 'document_repository'})}</a>
241+
<a style={{cursor: 'pointer'}} onClick={click}>
242+
{t('Delete', {ns: 'document_repository'})}
243+
</a>
234244
</td>;
235245
break;
236246
}
@@ -243,11 +253,12 @@ class DocIndex extends React.Component {
243253
* @return {JSX} - React markup for the component
244254
*/
245255
render() {
246-
const { t } = this.props;
256+
const {t} = this.props;
247257
// If error occurs, return a message.
248258
// XXX: Replace this with a UI component for 500 errors.
249259
if (this.state.error) {
250-
return <h3>{t('An error occured while loading the page.', {ns: 'document_repository'})}</h3>;
260+
return <h3>{t('An error occured while loading the page.',
261+
{ns: 'document_repository'})}</h3>;
251262
}
252263

253264
// Waiting for async data to load
@@ -258,34 +269,42 @@ class DocIndex extends React.Component {
258269
this.props.hasPermission('document_repository_upload_edit');
259270
const options = this.state.data.fieldOptions;
260271
const fields = [
261-
{label: t('File Name', {ns: 'document_repository'}), show: true, filter: {
272+
{label: t('File Name',
273+
{ns: 'document_repository'}), show: true, filter: {
262274
name: 'fileName',
263275
type: 'text',
264276
}},
265-
{label: t('Version', {ns: 'document_repository'}), show: true, filter: {
277+
{label: t('Version',
278+
{ns: 'document_repository'}), show: true, filter: {
266279
name: 'version',
267280
type: 'text',
268281
}},
269-
{label: t('File Type', {ns: 'document_repository'}), show: true, filter: {
282+
{label: t('File Type',
283+
{ns: 'document_repository'}), show: true, filter: {
270284
name: 'fileTypes',
271285
type: 'select',
272286
options: options.fileTypes,
273287
}},
274-
{label: t('Instrument', {ns: 'document_repository'}), show: false},
275-
{label: t('Uploaded By', {ns: 'document_repository'}), show: true, filter: {
288+
{label: t('Instrument',
289+
{ns: 'document_repository'}), show: false},
290+
{label: t('Uploaded By',
291+
{ns: 'document_repository'}), show: true, filter: {
276292
name: 'uploadedBy',
277293
type: 'text',
278294
}},
279-
{label: t('For Site', {ns: 'document_repository'}), show: true, filter: {
295+
{label: t('For Site',
296+
{ns: 'document_repository'}), show: true, filter: {
280297
name: 'site',
281298
type: 'select',
282299
options: options.sites,
283300
}},
284-
{label: t('Comments', {ns: 'document_repository'}), show: true, filter: {
301+
{label: t('Comments',
302+
{ns: 'document_repository'}), show: true, filter: {
285303
name: 'Comments',
286304
type: 'text',
287305
}},
288-
{label: t('Date Uploaded', {ns: 'document_repository'}), show: true},
306+
{label: t('Date Uploaded',
307+
{ns: 'document_repository'}), show: true},
289308
{
290309
label: t('Edit', {ns: 'document_repository'}),
291310
show: this.props.hasPermission('superUser')
@@ -466,7 +485,8 @@ DocIndex.propTypes = {
466485
window.addEventListener('load', () => {
467486
i18n.addResourceBundle('hi', 'document_repository', hiStrings);
468487

469-
const TranslatedDocIndex = withTranslation(['document_repository', 'loris'])(DocIndex);
488+
const TranslatedDocIndex = withTranslation(
489+
['document_repository', 'loris'])(DocIndex);
470490

471491
createRoot(
472492
document.getElementById('lorisworkspace')

‎modules/document_repository/jsx/editCategoryForm.js‎

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,11 @@ class EditDocCategoryForm extends React.Component {
6969
* @return {JSX} - React markup for the component
7070
*/
7171
render() {
72-
const { t } = this.props;
72+
const {t} = this.props;
7373
// Data loading error
7474
if (this.state.error) {
75-
return <h3>{t('An error occured while loading the page.', {ns: 'document_repository'})}</h3>;
75+
return <h3>{t('An error occured while loading the page.',
76+
{ns: 'document_repository'})}</h3>;
7677
}
7778
// Waiting for data to load
7879
if (!this.state.isLoaded) {
@@ -83,7 +84,8 @@ class EditDocCategoryForm extends React.Component {
8384
let updateButton = null;
8485
if (loris.userHasPermission('document_repository_categories')) {
8586
disabled = false;
86-
updateButton = <ButtonElement label={t('Edit Category', {ns: 'document_repository'})}/>;
87+
updateButton = <ButtonElement label={t('Edit Category',
88+
{ns: 'document_repository'})}/>;
8789
}
8890

8991
let errorSameParent = null;
@@ -92,7 +94,8 @@ class EditDocCategoryForm extends React.Component {
9294
this.state.formData.categoryID==this.state.formData.newParentID
9395
&& this.state.formData.categoryID!=null
9496
) {
95-
errorSameParent = t('Cannot be equal to itself', {ns: 'document_repository'});
97+
errorSameParent = t('Cannot be equal to itself',
98+
{ns: 'document_repository'});
9699
}
97100

98101
return (
@@ -102,7 +105,8 @@ class EditDocCategoryForm extends React.Component {
102105
name="categoryEdit"
103106
onSubmit={this.handleSubmit}
104107
>
105-
<h3>{t('Change Name of a category', {ns: 'document_repository'})}</h3><br/>
108+
<h3>{t('Change Name of a category',
109+
{ns: 'document_repository'})}</h3><br/>
106110
<SelectElement
107111
name="categoryID"
108112
label={t('Category Name:', {ns: 'document_repository'})}
@@ -114,7 +118,8 @@ class EditDocCategoryForm extends React.Component {
114118
/>
115119
<TextboxElement
116120
name="categoryNameChange"
117-
label={t('New Name for Category', {ns: 'document_repository'})}
121+
label={t('New Name for Category',
122+
{ns: 'document_repository'})}
118123
onUserInput={this.setFormData}
119124
required={true}
120125
disabled={disabled}
@@ -150,12 +155,13 @@ class EditDocCategoryForm extends React.Component {
150155
*/
151156
handleSubmit(e) {
152157
e.preventDefault();
153-
const { t } = this.props;
158+
const {t} = this.props;
154159
if (
155160
this.state.formData.categoryID==this.state.formData.newParentID
156161
&& this.state.formData.categoryID!=null
157162
) {
158-
swal.fire(t('New parent cannot be equal to itself', {ns: 'document_repository'}), '', 'error');
163+
swal.fire(t('New parent cannot be equal to itself',
164+
{ns: 'document_repository'}), '', 'error');
159165
} else {
160166
this.editCategory();
161167
}
@@ -172,7 +178,8 @@ class EditDocCategoryForm extends React.Component {
172178
formData.categoryID==formData.newParentID
173179
&& formData.categoryID!=null
174180
) {
175-
swal.fire(this.props.t('New parent cannot be equal to itself', {ns: 'document_repository'}), '', 'error');
181+
swal.fire(this.props.t('New parent cannot be equal to itself',
182+
{ns: 'document_repository'}), '', 'error');
176183
}
177184

178185
for (let key in formData) {
@@ -194,7 +201,8 @@ class EditDocCategoryForm extends React.Component {
194201
} else if (response.statusText) {
195202
msg = response.statusText;
196203
} else {
197-
msg = this.props.t('Edit error!', {ns: 'document_repository'});
204+
msg = this.props.t('Edit error!',
205+
{ns: 'document_repository'});
198206
}
199207
this.setState({
200208
errorMessage: msg,
@@ -203,15 +211,17 @@ class EditDocCategoryForm extends React.Component {
203211
console.error(msg);
204212
} else {
205213
swal.fire({
206-
text: this.props.t('Edited Successful!', {ns: 'document_repository'}),
214+
text: this.props.t('Edited Successful!',
215+
{ns: 'document_repository'}),
207216
title: '',
208217
type: 'success',
209218
}).then(function() {
210219
window.location.assign('/document_repository');
211220
});
212221
}
213222
}).catch( (error) => {
214-
let msg = error.message ? error.message : this.props.t('Edit error!', {ns: 'document_repository'});
223+
let msg = error.message ? error.message :
224+
this.props.t('Edit error!', {ns: 'document_repository'});
215225
this.setState({
216226
errorMessage: msg,
217227
uploadProgress: -1,
@@ -242,4 +252,5 @@ EditDocCategoryForm.propTypes = {
242252

243253
i18n.addResourceBundle('hi', 'document_repository', hiStrings);
244254

245-
export default withTranslation(['document_repository', 'loris'])(EditDocCategoryForm);
255+
export default withTranslation(
256+
['document_repository', 'loris'])(EditDocCategoryForm);

0 commit comments

Comments
 (0)