Skip to content

Commit adb2e31

Browse files
committed
Always wait for correct draft status, fix spelling
1 parent 9f39358 commit adb2e31

File tree

13 files changed

+43
-46
lines changed

13 files changed

+43
-46
lines changed

src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators';
22
import { RemoteData } from '../../../core/data/remote-data';
33
import { Version } from '../../../core/shared/version.model';
4-
import { map, startWith, switchMap, tap } from 'rxjs/operators';
4+
import { map, switchMap, tap } from 'rxjs/operators';
55
import { Item } from '../../../core/shared/item.model';
66
import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model';
77
import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
@@ -13,9 +13,7 @@ import { ItemDataService } from '../../../core/data/item-data.service';
1313
import { Injectable } from '@angular/core';
1414
import { Observable, of } from 'rxjs';
1515
import { ItemVersionsSharedService } from '../../../item-page/versions/item-versions-shared.service';
16-
import {
17-
ItemVersionsSummaryModalComponent
18-
} from '../../../item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component';
16+
import { ItemVersionsSummaryModalComponent } from '../../../item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component';
1917

2018
/**
2119
* Service to take care of all the functionality related to the version creation modal
@@ -86,7 +84,6 @@ export class DsoVersioningModalService {
8684
// button is disabled if hasDraftVersion = true, and enabled if hasDraftVersion = false or null
8785
// (hasDraftVersion is null when a version history does not exist)
8886
map((res) => Boolean(res)),
89-
startWith(true),
9087
);
9188
}
9289

src/assets/i18n/bn.json5

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3121,7 +3121,7 @@
31213121
// "item.page.version.create": "Create new version",
31223122
"item.page.version.create": "নতুন সংস্করণ তৈরি করুন",
31233123

3124-
// "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
3124+
// "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
31253125
"item.page.version.hasDraft": "একটি নতুন সংস্করণ তৈরি করা যাচ্ছে না কারণ ভার্সন হিস্ট্রিতে একটি জমা ইনপ্রগ্রেসস অবস্থাই রয়েছে",
31263126

31273127
// "item.preview.dc.identifier.uri": "Identifier:",
@@ -3250,7 +3250,7 @@
32503250
// "item.version.history.table.action.deleteVersion": "Delete version",
32513251
"item.version.history.table.action.deleteVersion": "মুছে ফেলুন সংস্করণ",
32523252

3253-
// "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
3253+
// "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
32543254
"item.version.history.table.action.hasDraft": "একটি নতুন সংস্করণ তৈরি করা যাচ্ছে না কারণ ভার্সন হিস্ট্রিতে একটি জমা ইনপ্রগ্রেসস অবস্থাই রয়েছে",
32553255

32563256

@@ -3291,7 +3291,7 @@
32913291
// "item.version.create.notification.failure" : "New version has not been created",
32923292
"item.version.create.notification.failure": "নতুন সংস্করণ তৈরি করা হয়নি",
32933293

3294-
// "item.version.create.notification.inProgress" : "A new version cannot be created because there is an inprogress submission in the version history",
3294+
// "item.version.create.notification.inProgress" : "A new version cannot be created because there is an in-progress submission in the version history",
32953295
"item.version.create.notification.inProgress": "একটি নতুন সংস্করণ তৈরি করা যাবে না কারণ ভার্সন হিস্ট্রিতে একটি জমা ইনপ্রগ্রেসস অবস্থাই রয়েছে",
32963296

32973297

src/assets/i18n/ca.json5

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3376,7 +3376,7 @@
33763376
// "item.page.version.create": "Create new version",
33773377
"item.page.version.create": "Crear una nova versió",
33783378

3379-
// "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
3379+
// "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
33803380
"item.page.version.hasDraft": "No es pot crear una nova versió perquè a l'historial de versions hi ha un enviament en curs",
33813381

33823382
// "item.page.claim.button": "Claim",
@@ -3535,7 +3535,7 @@
35353535
// "item.version.history.table.action.deleteVersion": "Delete version",
35363536
"item.version.history.table.action.deleteVersion": "Esborrar versió",
35373537

3538-
// "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
3538+
// "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
35393539
"item.version.history.table.action.hasDraft": "No és possible crear una nova versió ja que existeix a l'historial de versions un enviament pendent",
35403540

35413541

@@ -3582,7 +3582,7 @@
35823582
// "item.version.create.notification.failure" : "New version has not been created",
35833583
"item.version.create.notification.failure": "No s'ha creat una nova versió",
35843584

3585-
// "item.version.create.notification.inProgress" : "A new version cannot be created because there is an inprogress submission in the version history",
3585+
// "item.version.create.notification.inProgress" : "A new version cannot be created because there is an in-progress submission in the version history",
35863586
"item.version.create.notification.inProgress": "No és possible crear una nova versió ja que existeix a l'historial de versions un enviament pendent",
35873587

35883588

src/assets/i18n/en.json5

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2440,7 +2440,7 @@
24402440

24412441
"item.page.version.create": "Create new version",
24422442

2443-
"item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
2443+
"item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
24442444

24452445
"item.page.claim.button": "Claim",
24462446

@@ -2546,7 +2546,7 @@
25462546

25472547
"item.version.history.table.action.deleteVersion": "Delete version",
25482548

2549-
"item.version.history.table.action.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
2549+
"item.version.history.table.action.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
25502550

25512551
"item.version.notice": "This is not the latest version of this item. The latest version can be found <a href='{{destination}}'>here</a>.",
25522552

@@ -2576,7 +2576,7 @@
25762576

25772577
"item.version.create.notification.failure": "New version has not been created",
25782578

2579-
"item.version.create.notification.inProgress": "A new version cannot be created because there is an inprogress submission in the version history",
2579+
"item.version.create.notification.inProgress": "A new version cannot be created because there is an in-progress submission in the version history",
25802580

25812581
"item.version.delete.modal.header": "Delete version",
25822582

src/assets/i18n/es.json5

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3660,7 +3660,7 @@
36603660
// "item.page.version.create": "Create new version",
36613661
"item.page.version.create": "Crear una nueva version",
36623662

3663-
// "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
3663+
// "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
36643664
"item.page.version.hasDraft": "No se puede crear una nueva versión porque en el historial de versiones hay un envío en curso",
36653665

36663666
// "item.page.claim.button": "Claim",
@@ -3819,7 +3819,7 @@
38193819
// "item.version.history.table.action.deleteVersion": "Delete version",
38203820
"item.version.history.table.action.deleteVersion": "Borrar versión",
38213821

3822-
// "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
3822+
// "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
38233823
"item.version.history.table.action.hasDraft": "No es posible crear una nueva versión puesto que existe en el historial de versiones un envío pendiente",
38243824

38253825

@@ -3866,7 +3866,7 @@
38663866
// "item.version.create.notification.failure" : "New version has not been created",
38673867
"item.version.create.notification.failure": "No se ha creado una nueva versión",
38683868

3869-
// "item.version.create.notification.inProgress" : "A new version cannot be created because there is an inprogress submission in the version history",
3869+
// "item.version.create.notification.inProgress" : "A new version cannot be created because there is an in-progress submission in the version history",
38703870
"item.version.create.notification.inProgress": "No es posible crear una nueva versión puesto que existe en el historial de versiones un envío pendiente",
38713871

38723872

src/assets/i18n/fr.json5

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3108,7 +3108,7 @@
31083108
// "item.page.version.create": "Create new version",
31093109
"item.page.version.create": "Créer une nouvelle version",
31103110

3111-
// "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
3111+
// "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
31123112
"item.page.version.hasDraft": "Une nouvelle version ne peut être créée car il y a une soumission en cours dans l'historique des versions",
31133113

31143114
// "item.preview.dc.identifier.uri": "Identifier:",
@@ -3234,7 +3234,7 @@
32343234
// "item.version.history.table.action.deleteVersion": "Delete version",
32353235
"item.version.history.table.action.deleteVersion": "Supprimer la version",
32363236

3237-
// "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
3237+
// "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
32383238
"item.version.history.table.action.hasDraft": "Une nouvelle version ne peut pas être créée parce qu'il y a une soumission en cours dans l'historique des versions.",
32393239

32403240
// "item.version.notice": "This is not the latest version of this item. The latest version can be found <a href='{{destination}}'>here</a>.",
@@ -3273,7 +3273,7 @@
32733273
// "item.version.create.notification.failure": "New version has not been created",
32743274
"item.version.create.notification.failure": "La nouvelle version n'a pas été créée",
32753275

3276-
// "item.version.create.notification.inProgress": "A new version cannot be created because there is an inprogress submission in the version history",
3276+
// "item.version.create.notification.inProgress": "A new version cannot be created because there is an in-progress submission in the version history",
32773277
"item.version.create.notification.inProgress": "Une nouvelle version ne peut pas être créée parce qu'il y a une soumission en cours dans l'historique des versions.",
32783278

32793279
// "item.version.delete.modal.header": "Delete version",

src/assets/i18n/gd.json5

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3106,7 +3106,7 @@
31063106
// "item.page.version.create": "Create new version",
31073107
"item.page.version.create": "Cruthaich dreach ùr",
31083108

3109-
// "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
3109+
// "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
31103110
"item.page.version.hasDraft": "Cha ghabh dreach ùr a chruthachadh oir tha cur-a-steach a' tachairt ann an eachdraidh nan dreachan",
31113111

31123112
// "item.preview.dc.identifier.uri": "Identifier:",
@@ -3235,7 +3235,7 @@
32353235
// "item.version.history.table.action.deleteVersion": "Delete version",
32363236
"item.version.history.table.action.deleteVersion": "Dubh às dreach",
32373237

3238-
// "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
3238+
// "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
32393239
"item.version.history.table.action.hasDraft": "Cha ghabh dreach ùr a chruthachadh oir tha cur-a-steach a' tachairt ann an eachdraidh nan dreachan",
32403240

32413241

@@ -3276,7 +3276,7 @@
32763276
// "item.version.create.notification.failure" : "New version has not been created",
32773277
"item.version.create.notification.failure": "Cha deach dreach ùr a chruthachadh",
32783278

3279-
// "item.version.create.notification.inProgress" : "A new version cannot be created because there is an inprogress submission in the version history",
3279+
// "item.version.create.notification.inProgress" : "A new version cannot be created because there is an in-progress submission in the version history",
32803280
"item.version.create.notification.inProgress": "Cha ghabh dreach ùr a chruthachadh oir tha cur-a-steach a' tachairt ann an eachdraidh nan dreachan",
32813281

32823282

src/assets/i18n/hu.json5

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3975,9 +3975,9 @@
39753975
// TODO New key - Add a translation
39763976
"item.page.version.create": "Create new version",
39773977

3978-
// "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
3978+
// "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
39793979
// TODO New key - Add a translation
3980-
"item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
3980+
"item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
39813981

39823982
// "item.page.claim.button": "Claim",
39833983
// TODO New key - Add a translation
@@ -4162,9 +4162,9 @@
41624162
// TODO New key - Add a translation
41634163
"item.version.history.table.action.deleteVersion": "Delete version",
41644164

4165-
// "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
4165+
// "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
41664166
// TODO New key - Add a translation
4167-
"item.version.history.table.action.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
4167+
"item.version.history.table.action.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
41684168

41694169

41704170
// "item.version.notice": "This is not the latest version of this item. The latest version can be found <a href='{{destination}}'>here</a>.",
@@ -4223,9 +4223,9 @@
42234223
// TODO New key - Add a translation
42244224
"item.version.create.notification.failure": "New version has not been created",
42254225

4226-
// "item.version.create.notification.inProgress" : "A new version cannot be created because there is an inprogress submission in the version history",
4226+
// "item.version.create.notification.inProgress" : "A new version cannot be created because there is an in-progress submission in the version history",
42274227
// TODO New key - Add a translation
4228-
"item.version.create.notification.inProgress": "A new version cannot be created because there is an inprogress submission in the version history",
4228+
"item.version.create.notification.inProgress": "A new version cannot be created because there is an in-progress submission in the version history",
42294229

42304230

42314231
// "item.version.delete.modal.header": "Delete version",

src/assets/i18n/it.json5

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3861,7 +3861,7 @@
38613861
// "item.page.version.create": "Create new version",
38623862
"item.page.version.create": "Crea una nuova versione",
38633863

3864-
// "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
3864+
// "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
38653865
"item.page.version.hasDraft": "Impossibile creare una nuova versione perché è presente un'submission in corso nella cronologia delle versioni",
38663866

38673867
// "item.page.claim.button": "Claim",
@@ -4028,7 +4028,7 @@
40284028
// "item.version.history.table.action.deleteVersion": "Delete version",
40294029
"item.version.history.table.action.deleteVersion": "Elimina versione",
40304030

4031-
// "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
4031+
// "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
40324032
"item.version.history.table.action.hasDraft": "Non è possibile creare una nuova versione perchè c'è già una submission in progress nella cronologia delle versioni",
40334033

40344034

@@ -4077,7 +4077,7 @@
40774077
// TODO Source message changed - Revise the translation
40784078
"item.version.create.notification.failure": "Non è stata creata una nuova versione",
40794079

4080-
// "item.version.create.notification.inProgress": "A new version cannot be created because there is an inprogress submission in the version history",
4080+
// "item.version.create.notification.inProgress": "A new version cannot be created because there is an in-progress submission in the version history",
40814081
// TODO Source message changed - Revise the translation
40824082
"item.version.create.notification.inProgress": "Non è possibile creare una nuova versione perchè c'è già una submission in progress nella cronologia delle versioni",
40834083

src/assets/i18n/kk.json5

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3321,7 +3321,7 @@
33213321
// "item.page.version.create": "Create new version",
33223322
"item.page.version.create": "Жаңа нұсқасын жасау",
33233323

3324-
// "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
3324+
// "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
33253325
"item.page.version.hasDraft": "Жаңа нұсқаны жасау мүмкін емес, өйткені нұсқа тарихында аяқталмаған жіберу бар",
33263326

33273327
// "item.page.claim.button": "Claim",
@@ -3481,7 +3481,7 @@
34813481
// "item.version.history.table.action.deleteVersion": "Delete version",
34823482
"item.version.history.table.action.deleteVersion": "Нұсқаны өшіру",
34833483

3484-
// "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
3484+
// "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
34853485
"item.version.history.table.action.hasDraft": "Жаңа нұсқаны жасау мүмкін емес, өйткені нұсқа тарихында аяқталмаған бағынымдар бар",
34863486

34873487

@@ -3528,7 +3528,7 @@
35283528
// "item.version.create.notification.failure" : "New version has not been created",
35293529
"item.version.create.notification.failure": "Жаңа нұсқа жасалмады",
35303530

3531-
// "item.version.create.notification.inProgress" : "A new version cannot be created because there is an inprogress submission in the version history",
3531+
// "item.version.create.notification.inProgress" : "A new version cannot be created because there is an in-progress submission in the version history",
35323532
"item.version.create.notification.inProgress": "Жаңа нұсқаны жасау мүмкін емес, өйткені нұсқа тарихында аяқталмаған жіберу бар",
35333533

35343534

0 commit comments

Comments
 (0)