Merge branch 'master' into w2p-68346_Bundles-in-edit-item-Updates

Conflicts:
	src/app/core/cache/server-sync-buffer.effects.ts
	src/app/core/data/data.service.spec.ts
	src/app/core/data/data.service.ts
	src/app/shared/shared.module.ts
This commit is contained in:
Kristof De Langhe
2020-03-19 17:12:04 +01:00
111 changed files with 4654 additions and 460 deletions

View File

@@ -10,6 +10,7 @@ import { coreSelector } from '../core.selectors';
import { RestRequestMethod } from '../data/rest-request-method';
import { selfLinkFromUuidSelector } from '../index/index.selectors';
import { GenericConstructor } from '../shared/generic-constructor';
import { getClassForType } from './builders/build-decorators';
import { LinkService } from './builders/link.service';
import {
AddPatchObjectCacheAction,
@@ -20,7 +21,6 @@ import {
import { CacheableObject, ObjectCacheEntry, ObjectCacheState } from './object-cache.reducer';
import { AddToSSBAction } from './server-sync-buffer.actions';
import { getClassForType } from './builders/build-decorators';
/**
* The base selector function to select the object cache in the store
@@ -48,7 +48,7 @@ export class ObjectCacheService {
constructor(
private store: Store<CoreState>,
private linkService: LinkService
) {
) {
}
/**

View File

@@ -108,7 +108,7 @@ export class ServerSyncBufferEffects {
}
return new ApplyPatchObjectCacheAction(href);
})
)
);
}
constructor(private actions$: Actions,