Skip to content
Permalink
Browse files
Merge pull request #5 from davidyaha/feature/fix-ts
Fix ts compilation
  • Loading branch information
awasum committed Aug 2, 2018
2 parents 58252f8 + 3bcc5ef commit 6b10d04bf196c432dac28e1b858b8a9a621738cd
Show file tree
Hide file tree
Showing 7 changed files with 7,178 additions and 12 deletions.
@@ -12,14 +12,14 @@
"test": "ng test --single-run",
"karma": "karma start ./karma.conf.js --single-run",
"devTest": "ng test",
"dev": "ng serve --verbose --proxy-config proxy.conf.json",
"dev": "ng serve --watch --verbose --proxy-config proxy.conf.json",
"runProd": "ng serve --proxy-config proxy.conf.json --prod",
"build": "ng build --prod",
"checkLicenses": "license-to-fail ./license.config.js",
"bundle-report": "webpack-bundle-analyzer dist/stats.json"
},
"engines": {
"node": ">4.4 < 7",
"node": ">4.4",
"npm": ">3"
},
"repository": {
@@ -47,7 +47,7 @@
"@angular/router": "4.4.5",
"@covalent/core": "1.0.0-beta.8-1",
"@ngrx/core": "1.2.0",
"@ngrx/effects": "2.0.3",
"@ngrx/effects": "2.0.5",
"@ngrx/store": "2.2.2",
"@ngrx/store-devtools": "3.2.4",
"@ngx-translate/core": "7.0.0",
@@ -58,7 +58,7 @@
"highlight.js": "9.10.0",
"ngrx-store-localstorage": "0.1.8",
"reselect": "2.5.4",
"rxjs": "5.4.1",
"rxjs": "^5.6.0-forward-compat.5",
"showdown": "1.6.4",
"text-mask-addons": "^3.6.0",
"zone.js": "0.8.17"
@@ -32,7 +32,7 @@ export class TransactionTypeApiEffects {
searchTransactionTypes$: Observable<Action> = this.actions$
.ofType(transactionTypeActions.SEARCH)
.map((action: transactionTypeActions.SearchAction) => action.payload)
.mergeMap(fetchRequest =>
.mergeMap(({ fetchRequest }) =>
this.accountingService.fetchTransactionTypes(fetchRequest)
.map(transactionTypePage => new transactionTypeActions.SearchCompleteAction({
elements: transactionTypePage.transactionTypes,
@@ -29,8 +29,8 @@ import {Fee} from '../services/domain/fee.model';
import {FeeService} from '../services/fee.service';

interface Parameter {
productId: string;
caseId: string;
productId?: string;
caseId?: string;
action: string;
}

@@ -34,10 +34,10 @@ export class ProductApiEffects {
.ofType(productActions.SEARCH)
.map((action: productActions.SelectAction) => action.payload)
.debounceTime(300)
.switchMap(fetchRequest => {
.switchMap(({ selectedId }) => {
const nextSearch$ = this.actions$.ofType(productActions.SEARCH).skip(1);

return this.portfolioService.findAllProducts(true, fetchRequest)
return this.portfolioService.findAllProducts(true, { searchTerm: selectedId })
.takeUntil(nextSearch$)
.map(productPage => new productActions.SearchCompleteAction({
elements: mapToFimsProducts(productPage.elements),
@@ -17,6 +17,6 @@
* under the License.
*/
export interface MICRResolution {
office: string;
customer: string;
office?: string;
customer?: string;
}
@@ -40,7 +40,7 @@ export class ImageService {
headers: headers
})
.map((response: Response) => response.blob())
.catch(() => Observable.empty()));
.catch(() => Observable.of(new Blob())));
}

private mapHeader(authenticationState: State): Headers {

0 comments on commit 6b10d04

Please sign in to comment.