DigitaleBibliothek / Frontend / d932b44a770

Commits

Lotte Hofstede authored d932b44a770 03 May 2017

40416: small fixes and thumbnails

src/app/core/cache/models/bundle-builder.ts

Modified

-7
+import { NormalizedBundle } from "./normalized-bundle.model";
-8
+import { ListRemoteDataBuilder, SingleRemoteDataBuilder } from "./remote-data-builder";
-9
+import { Request } from "../../data/request.models";
-10
+import { hasValue } from "../../../shared/empty.util";
-11
+import { RequestConfigureAction, RequestExecuteAction } from "../../data/request.actions";
-12
+import { BitstreamRDBuilder } from "./bitstream-builder";
-13
+import { NormalizedBitstream } from "./normalized-bitstream.model";
-14
-15
+export class BundleBuilder {
-16
--
+  constructor(
--
+    protected objectCache: ObjectCacheService,
--
+    protected responseCache: ResponseCacheService,
--
+    protected requestService: RequestService,
--
+    protected store: Store<CoreState>,
--
+    protected href: string,
--
+    protected normalized: NormalizedBundle
--
+  ) {
--
+  }
-+
+    constructor(protected objectCache: ObjectCacheService,
-+
+                protected responseCache: ResponseCacheService,
-+
+                protected requestService: RequestService,
-+
+                protected store: Store<CoreState>,
-+
+                protected href: string,
-+
+                protected normalized: NormalizedBundle) {
-+
+    }
-+
-+
+    build(): Bundle {
-+
+        let links: any = {};
-27
--
+  build(): Bundle {
--
+    let links: any = {};
-+
+        if (hasValue(this.normalized.bitstreams)) {
-+
+            //for some reason the dispatches in the forEach don't
-+
+            //fire without this timeout. A zone issue?
-+
+            setTimeout(() => {
-+
+                this.normalized.bitstreams.forEach((href: string) => {
-+
+                    const isCached = this.objectCache.hasBySelfLink(href);
-+
+                    const isPending = this.requestService.isPending(href);
-35
--
+    if (hasValue(this.normalized.bitstreams)) {
--
+      //for some reason the dispatches in the forEach don't
--
+      //fire without this timeout. A zone issue?
--
+      setTimeout(() => {
--
+        this.normalized.bitstreams.forEach((href: string) => {
--
+          const isCached = this.objectCache.hasBySelfLink(href);
--
+          const isPending = this.requestService.isPending(href);
-+
+                    if (!(isCached || isPending)) {
-+
+                        const request = new Request(href, NormalizedBitstream);
-+
+                        this.store.dispatch(new RequestConfigureAction(request));
-+
+                        this.store.dispatch(new RequestExecuteAction(href));
-+
+                    }
-+
+                });
-+
+            }, 0);
-43
--
+          if (!(isCached || isPending)) {
--
+            const request = new Request(href, NormalizedBitstream);
--
+            this.store.dispatch(new RequestConfigureAction(request));
--
+            this.store.dispatch(new RequestExecuteAction(href));
--
+          }
--
+        });
--
+      }, 0);
-+
+            links.bitstreams = this.normalized.bitstreams.map((href: string) => {
-+
+                return new BitstreamRDBuilder(
-+
+                    this.objectCache,
-+
+                    this.responseCache,
-+
+                    this.requestService,
-+
+                    this.store,
-+
+                    href
-+
+                ).build();
-+
+            });
-+
+        }
-54
--
+      links.bitstreams = this.normalized.bitstreams.map((href: string) => {
--
+        return new BitstreamRDBuilder(
--
+          this.objectCache,
--
+          this.responseCache,
--
+          this.requestService,
--
+          this.store,
--
+          href
--
+        ).build();
--
+      });
-+
+        if (hasValue(this.normalized.primaryBitstream)) {
-+
+            const href = this.normalized.primaryBitstream;
-+
+            //for some reason the dispatches in the forEach don't
-+
+            //fire without this timeout. A zone issue?
-+
+            setTimeout(() => {
-+
+                const isCached = this.objectCache.hasBySelfLink(href);
-+
+                const isPending = this.requestService.isPending(href);
-+
-+
+                if (!(isCached || isPending)) {
-+
+                    const request = new Request(href, NormalizedBitstream);
-+
+                    this.store.dispatch(new RequestConfigureAction(request));
-+
+                    this.store.dispatch(new RequestExecuteAction(href));
-+
+                }
-+
+            }, 0);
-+
+            links.primaryBitstream =
-+
+                new BitstreamRDBuilder(
-+
+                    this.objectCache,
-+
+                    this.responseCache,
-+
+                    this.requestService,
-+
+                    this.store,
-+
+                    href
-+
+                ).build();
-+
+        }
-+
+        return Object.assign(new Bundle(), this.normalized, links);
-79
+    }
--
+    return Object.assign(new Bundle(), this.normalized, links);
--
+  }
-80
+}
-81
-82
+export class BundleRDBuilder extends SingleRemoteDataBuilder<Bundle, NormalizedBundle> {
-83
--
+  constructor(
--
+    objectCache: ObjectCacheService,
--
+    responseCache: ResponseCacheService,
--
+    requestService: RequestService,
--
+    store: Store<CoreState>,
--
+    href: string
--
+  ) {
--
+    super(objectCache, responseCache, requestService, store, href, NormalizedBundle);
--
+  }
-+
+    constructor(objectCache: ObjectCacheService,
-+
+                responseCache: ResponseCacheService,
-+
+                requestService: RequestService,
-+
+                store: Store<CoreState>,
-+
+                href: string) {
-+
+        super(objectCache, responseCache, requestService, store, href, NormalizedBundle);
-+
+    }
-91
--
+  protected normalizedToDomain(normalized: NormalizedBundle): Bundle {
--
+    return new BundleBuilder(this.objectCache, this.responseCache, this.requestService, this.store, this.href, normalized).build();
--
+  }
-+
+    protected normalizedToDomain(normalized: NormalizedBundle): Bundle {
-+
+        return new BundleBuilder(this.objectCache, this.responseCache, this.requestService, this.store, this.href, normalized).build();
-+
+    }
-95
-96
+}
-97
-98
+export class BundleListRDBuilder extends ListRemoteDataBuilder<Bundle, NormalizedBundle> {
--
+  constructor(
--
+    objectCache: ObjectCacheService,
--
+    responseCache: ResponseCacheService,
--
+    requestService: RequestService,
--
+    store: Store<CoreState>,
--
+    href: string
--
+  ) {
--
+    super(objectCache, responseCache, requestService, store, href, NormalizedBundle);
--
+  }
-+
+    constructor(objectCache: ObjectCacheService,
-+
+                responseCache: ResponseCacheService,
-+
+                requestService: RequestService,
-+
+                store: Store<CoreState>,
-+
+                href: string) {
-+
+        super(objectCache, responseCache, requestService, store, href, NormalizedBundle);
-+
+    }
-106
--
+  protected normalizedToDomain(normalized: NormalizedBundle): Bundle {
--
+    return new BundleBuilder(this.objectCache, this.responseCache, this.requestService, this.store, this.href, normalized).build();
--
+  }
-+
+    protected normalizedToDomain(normalized: NormalizedBundle): Bundle {
-+
+        return new BundleBuilder(this.objectCache, this.responseCache, this.requestService, this.store, this.href, normalized).build();
-+
+    }
-110
-111
+}

Frontend

Commits

Jira Issues

Add shortcut