Clean up draft version pipe

ybnd · Feb 7, 2024 · d9bcbe4 · d9bcbe4
1 parent 54a720f
commit d9bcbe4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/src/app/core/data/version-history-data.service.ts b/src/app/core/data/version-history-data.service.ts
@@ -170,14 +170,13 @@ export class VersionHistoryDataService extends IdentifiableDataService<VersionHi
   hasDraftVersion$(versionHref: string): Observable<boolean> {
     return this.versionDataService.findByHref(versionHref, false, true, followLink('versionhistory')).pipe(
       getFirstCompletedRemoteData(),
-      switchMap((res) => {
-        if (res.hasSucceeded && !res.hasNoContent) {
-          return res.payload.versionhistory.pipe(
+      switchMap((versionRD: RemoteData<Version>) => {
+        if (versionRD.hasSucceeded && !versionRD.hasNoContent) {
+          return versionRD.payload.versionhistory.pipe(
             getFirstCompletedRemoteData(),
-            map((versionHistoryRD) => {
-              if (res.hasSucceeded) {
-                const versionHistory = versionHistoryRD.payload;
-                return versionHistory ? versionHistory.draftVersion : false;
+            map((versionHistoryRD: RemoteData<VersionHistory>) => {
+              if (versionHistoryRD.hasSucceeded && !versionHistoryRD.hasNoContent) {
+                return versionHistoryRD.payload.draftVersion;
               } else {
                 return false;
               }

diff --git a/src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.ts b/src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.ts
@@ -86,7 +86,7 @@ export class DsoVersioningModalService {
       // button is disabled if hasDraftVersion = true, and enabled if hasDraftVersion = false or null
       // (hasDraftVersion is null when a version history does not exist)
       map((res) => Boolean(res)),
-      startWith(true),
+      // startWith(true),
     );
   }