Fixes for applying changes in viewmodel binders. (#160)

azaslonov · web-flow · commit e315b3c050f1 · 2019-09-16T16:33:23.000-07:00
diff --git a/src/components/apis/details-of-api/ko/detailsOfApiViewModelBinder.ts b/src/components/apis/details-of-api/ko/detailsOfApiViewModelBinder.ts
@@ -15,8 +15,7 @@ export class DetailsOfApiViewModelBinder implements ViewModelBinder<DetailsOfApi
             model: model,
             editor: "details-of-api-editor",
             applyChanges: async (updatedModel: DetailsOfApiModel) => {
-                Object.assign(model, updatedModel);
-                this.modelToViewModel(model, viewModel, bindingContext);
+                this.modelToViewModel(updatedModel, viewModel, bindingContext);
             }
         };
 
diff --git a/src/components/apis/runtime/api-list/api-list.ts b/src/components/apis/runtime/api-list/api-list.ts
@@ -1,6 +1,6 @@
 import * as ko from "knockout";
 import template from "./api-list.html";
-import { SearchRequest } from "../../../../contracts/searchRequest";
+import { ApiSearchQuery } from "../../../../contracts/apiSearchQuery";
 import { Component, RuntimeComponent, Param, OnMounted } from "@paperbits/common/ko/decorators";
 import { Utils } from "../../../../utils";
 import { TagService } from "../../../../services/tagService";
@@ -15,7 +15,7 @@ import { Api } from "../../../../models/api";
     injectable: "apiList"
 })
 export class ApiList {
-    private searchRequest: SearchRequest;
+    private searchRequest: ApiSearchQuery;
     private queryParams: URLSearchParams;
 
     public apis: ko.ObservableArray<Api>;
@@ -118,7 +118,7 @@ export class ApiList {
         }
     }
 
-    public async searchApis(searchRequest?: SearchRequest): Promise<void> {
+    public async searchApis(searchRequest?: ApiSearchQuery): Promise<void> {
         this.working(true);
 
         this.searchRequest = searchRequest || this.searchRequest || { pattern: "", tags: [], grouping: "none" };
diff --git a/src/components/operations/operation-details/ko/operationDetailsViewModelBinder.ts b/src/components/operations/operation-details/ko/operationDetailsViewModelBinder.ts
@@ -14,8 +14,7 @@ export class OperationDetailsViewModelBinder implements ViewModelBinder<Operatio
             model: model,
             editor: "operation-details-editor",
             applyChanges: async (updatedModel: OperationDetailsModel) => {
-                Object.assign(model, updatedModel);
-                this.modelToViewModel(model, viewModel, bindingContext);
+                this.modelToViewModel(updatedModel, viewModel, bindingContext);
             }
         };
 
diff --git a/src/components/operations/operation-list/ko/operationListViewModelBinder.ts b/src/components/operations/operation-list/ko/operationListViewModelBinder.ts
@@ -14,8 +14,7 @@ export class OperationListViewModelBinder implements ViewModelBinder<OperationLi
             model: model,
             editor: "operation-list-editor",
             applyChanges: async (updatedModel: OperationListModel) => {
-                Object.assign(model, updatedModel);
-                this.modelToViewModel(model, viewModel, bindingContext);
+                this.modelToViewModel(updatedModel, viewModel, bindingContext);
             }
         };
 
diff --git a/src/components/products/product-apis/ko/productApisViewModelBinder.ts b/src/components/products/product-apis/ko/productApisViewModelBinder.ts
@@ -13,8 +13,7 @@ export class ProductApisViewModelBinder implements ViewModelBinder<ProductApisMo
             displayName: "Product: APIs",
             model: model,
             applyChanges: async (updatedModel: ProductApisModel) => {
-                Object.assign(model, updatedModel);
-                this.modelToViewModel(model, viewModel, bindingContext);
+                this.modelToViewModel(updatedModel, viewModel, bindingContext);
             }
         };
 
diff --git a/src/components/products/product-details/ko/productDetailsViewModelBinder.ts b/src/components/products/product-details/ko/productDetailsViewModelBinder.ts
@@ -13,8 +13,7 @@ export class ProductDetailsViewModelBinder implements ViewModelBinder<ProductDet
             displayName: "Product: Details",
             model: model,
             applyChanges: async (updatedModel: ProductDetailsModel) => {
-                Object.assign(model, updatedModel);
-                this.modelToViewModel(model, viewModel, bindingContext);
+                this.modelToViewModel(updatedModel, viewModel, bindingContext);
             }
         };
 
diff --git a/src/components/products/product-list/ko/productListViewModelBinder.ts b/src/components/products/product-list/ko/productListViewModelBinder.ts
@@ -14,8 +14,7 @@ export class ProductListViewModelBinder implements ViewModelBinder<ProductListMo
             model: model,
             editor: "product-list-editor",
             applyChanges: async (updatedModel: ProductListModel) => {
-                Object.assign(model, updatedModel);
-                this.modelToViewModel(model, viewModel, bindingContext);
+                this.modelToViewModel(updatedModel, viewModel, bindingContext);
             }
         };
 
diff --git a/src/components/products/product-subscribe/ko/productSubscribeViewModelBinder.ts b/src/components/products/product-subscribe/ko/productSubscribeViewModelBinder.ts
@@ -13,8 +13,7 @@ export class ProductSubscribeViewModelBinder implements ViewModelBinder<ProductS
             displayName: "Product: Subscribe form",
             model: model,
             applyChanges: async (updatedModel: ProductSubscribeModel) => {
-                Object.assign(model, updatedModel);
-                this.modelToViewModel(model, viewModel, bindingContext);
+                this.modelToViewModel(updatedModel, viewModel, bindingContext);
             }
         };
 
diff --git a/src/components/products/product-subscriptions/ko/productSubscriptionsViewModelBinder.ts b/src/components/products/product-subscriptions/ko/productSubscriptionsViewModelBinder.ts
@@ -13,8 +13,7 @@ export class ProductSubscriptionsViewModelBinder implements ViewModelBinder<Prod
             displayName: "Product: Subscriptions",
             model: model,
             applyChanges: async (updatedModel: ProductSubscriptionsModel) => {
-                Object.assign(model, updatedModel);
-                this.modelToViewModel(model, viewModel, bindingContext);
+                this.modelToViewModel(updatedModel, viewModel, bindingContext);
             }
         };
 
diff --git a/src/components/users/runtime/user-signin/user-signin.ts b/src/components/users/runtime/user-signin/user-signin.ts
@@ -14,7 +14,7 @@ import { MapiError } from "../../../../services/mapiError";
 export class UserSignin {
     public username: ko.Observable<string>;
     public password: ko.Observable<string>;
-    public canSignin: ko.Computed<boolean>;
+    public canSubmit: ko.Computed<boolean>;
     public errorMessages: ko.ObservableArray<string>;
     public hasErrors: ko.Observable<boolean>;
     public working: ko.Observable<boolean>;
@@ -25,7 +25,7 @@ export class UserSignin {
         this.errorMessages = ko.observableArray([]);
         this.hasErrors = ko.observable(false);
         this.working = ko.observable(false);
-        this.canSignin = ko.pureComputed(() => {
+        this.canSubmit = ko.pureComputed(() => {
             return !!this.username() && !!this.password() && !this.working();
         });
     }
diff --git a/src/components/users/user-details/ko/userDetailsViewModelBinder.ts b/src/components/users/user-details/ko/userDetailsViewModelBinder.ts
@@ -13,8 +13,7 @@ export class UserDetailsViewModelBinder implements ViewModelBinder<UserDetailsMo
             displayName: "User: Profile",
             model: model,
             applyChanges: async (updatedModel: UserDetailsModel) => {
-                Object.assign(model, updatedModel);
-                this.modelToViewModel(model, viewModel, bindingContext);
+                this.modelToViewModel(updatedModel, viewModel, bindingContext);
             }
         };
 
diff --git a/src/components/users/user-signin/ko/userSigninViewModelBinder.ts b/src/components/users/user-signin/ko/userSigninViewModelBinder.ts
@@ -15,8 +15,7 @@ export class UserSigninViewModelBinder implements ViewModelBinder<UserSigninMode
             displayName: "Sign-in form",
             model: model,
             applyChanges: async (updatedModel: UserSigninModel) => {
-                Object.assign(model, updatedModel);
-                this.modelToViewModel(model, viewModel, bindingContext);
+                this.modelToViewModel(updatedModel, viewModel, bindingContext);
             }
         };
 
diff --git a/src/components/users/user-signup/ko/userSignupViewModelBinder.ts b/src/components/users/user-signup/ko/userSignupViewModelBinder.ts
@@ -14,8 +14,7 @@ export class UserSignupViewModelBinder implements ViewModelBinder<UserSignupMode
             name: "User signup",
             model: model,
             applyChanges: async (updatedModel: UserSignupModel) => {
-                Object.assign(model, updatedModel);
-                this.modelToViewModel(model, viewModel, bindingContext);
+                this.modelToViewModel(updatedModel, viewModel, bindingContext);
             }
         };
 
diff --git a/src/components/users/user-subscriptions/ko/userSubscriptionsViewModelBinder.ts b/src/components/users/user-subscriptions/ko/userSubscriptionsViewModelBinder.ts
@@ -13,8 +13,7 @@ export class UserSubscriptionsViewModelBinder implements ViewModelBinder<UserSub
             displayName: "User: Subscriptions",
             model: model,
             applyChanges: async (updatedModel: UserSubscriptionsModel) => {
-                Object.assign(model, updatedModel);
-                this.modelToViewModel(model,  viewModel, bindingContext);
+                this.modelToViewModel(updatedModel, viewModel, bindingContext);
             }
         };
 
diff --git a/src/contracts/apiSearchQuery.ts b/src/contracts/apiSearchQuery.ts
@@ -0,0 +1,9 @@
+import { Tag } from "../models/tag";
+
+export interface ApiSearchQuery {
+    pattern: string;
+    tags: Tag[];
+    skip?: string;
+    top?: string;
+    grouping?: string;
+}
diff --git a/src/services/apiService.ts b/src/services/apiService.ts
@@ -2,7 +2,7 @@ import { ProductContract } from "./../contracts/product";
 import { ApiContract } from "../contracts/api";
 import { TagResourceContract } from "../contracts/tagResource";
 import { PageContract } from "../contracts/page";
-import { SearchRequest } from "../contracts/searchRequest";
+import { ApiSearchQuery } from "../contracts/apiSearchQuery";
 import { Api } from "../models/api";
 import { VersionSet } from "../models/versionSet";
 import { Page } from "../models/page";
@@ -20,7 +20,7 @@ import { HttpHeader } from "@paperbits/common/http/httpHeader";
 export class ApiService {
     constructor(private readonly smapiClient: MapiClient) { }
 
-    public async getApis(searchRequest?: SearchRequest): Promise<Page<Api>> {
+    public async getApis(searchRequest?: ApiSearchQuery): Promise<Page<Api>> {
         let query = "/apis?expandApiVersionSet=true";
 
         if (searchRequest) {
@@ -61,7 +61,7 @@ export class ApiService {
         return result;
     }
 
-    public async getApisByTags(searchRequest?: SearchRequest): Promise<PageContract<TagResourceContract[]>> {
+    public async getApisByTags(searchRequest?: ApiSearchQuery): Promise<PageContract<TagResourceContract[]>> {
         throw new Error("Not implemented.");
     }
 
@@ -134,25 +134,25 @@ export class ApiService {
         return operation;
     }
 
-    public async getOperations(apiId: string, searchRequest?: SearchRequest): Promise<Page<Operation>> {
+    public async getOperations(apiId: string, searchQuery?: ApiSearchQuery): Promise<Page<Operation>> {
         let query = `${apiId}/operations`;
 
         let top;
 
-        if (searchRequest) {
-            searchRequest.tags.forEach((tag, index) => {
+        if (searchQuery) {
+            searchQuery.tags.forEach((tag, index) => {
                 query = Utils.addQueryParameter(query, `tags[${index}]=${tag.name}`);
             });
 
-            if (searchRequest.pattern) {
-                const pattern = Utils.escapeValueForODataFilter(searchRequest.pattern);
+            if (searchQuery.pattern) {
+                const pattern = Utils.escapeValueForODataFilter(searchQuery.pattern);
                 query = Utils.addQueryParameter(query, `$filter=contains(properties/name,'${encodeURIComponent(pattern)}')`);
             }
 
-            top = searchRequest.top;
+            top = searchQuery.top;
 
-            if (searchRequest.skip) {
-                query = Utils.addQueryParameter(query, `$skip=${searchRequest.skip}`);
+            if (searchQuery.skip) {
+                query = Utils.addQueryParameter(query, `$skip=${searchQuery.skip}`);
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,7 @@ export class DetailsOfApiViewModelBinder implements ViewModelBinder<DetailsOfApi`
`15`	`15`	`model: model,`
`16`	`16`	`editor: "details-of-api-editor",`
`17`	`17`	`applyChanges: async (updatedModel: DetailsOfApiModel) => {`
`18`		`- Object.assign(model, updatedModel);`
`19`		`- this.modelToViewModel(model, viewModel, bindingContext);`
	`18`	`+ this.modelToViewModel(updatedModel, viewModel, bindingContext);`
`20`	`19`	`}`
`21`	`20`	`};`
`22`	`21`
Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,7 @@ export class OperationDetailsViewModelBinder implements ViewModelBinder<Operatio`
`14`	`14`	`model: model,`
`15`	`15`	`editor: "operation-details-editor",`
`16`	`16`	`applyChanges: async (updatedModel: OperationDetailsModel) => {`
`17`		`- Object.assign(model, updatedModel);`
`18`		`- this.modelToViewModel(model, viewModel, bindingContext);`
	`17`	`+ this.modelToViewModel(updatedModel, viewModel, bindingContext);`
`19`	`18`	`}`
`20`	`19`	`};`
`21`	`20`
Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,7 @@ export class ProductApisViewModelBinder implements ViewModelBinder<ProductApisMo`
`13`	`13`	`displayName: "Product: APIs",`
`14`	`14`	`model: model,`
`15`	`15`	`applyChanges: async (updatedModel: ProductApisModel) => {`
`16`		`- Object.assign(model, updatedModel);`
`17`		`- this.modelToViewModel(model, viewModel, bindingContext);`
	`16`	`+ this.modelToViewModel(updatedModel, viewModel, bindingContext);`
`18`	`17`	`}`
`19`	`18`	`};`
`20`	`19`
Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,7 @@ export class ProductDetailsViewModelBinder implements ViewModelBinder<ProductDet`
`13`	`13`	`displayName: "Product: Details",`
`14`	`14`	`model: model,`
`15`	`15`	`applyChanges: async (updatedModel: ProductDetailsModel) => {`
`16`		`- Object.assign(model, updatedModel);`
`17`		`- this.modelToViewModel(model, viewModel, bindingContext);`
	`16`	`+ this.modelToViewModel(updatedModel, viewModel, bindingContext);`
`18`	`17`	`}`
`19`	`18`	`};`
`20`	`19`
Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,7 @@ export class ProductListViewModelBinder implements ViewModelBinder<ProductListMo`
`14`	`14`	`model: model,`
`15`	`15`	`editor: "product-list-editor",`
`16`	`16`	`applyChanges: async (updatedModel: ProductListModel) => {`
`17`		`- Object.assign(model, updatedModel);`
`18`		`- this.modelToViewModel(model, viewModel, bindingContext);`
	`17`	`+ this.modelToViewModel(updatedModel, viewModel, bindingContext);`
`19`	`18`	`}`
`20`	`19`	`};`
`21`	`20`
Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,7 @@ export class ProductSubscribeViewModelBinder implements ViewModelBinder<ProductS`
`13`	`13`	`displayName: "Product: Subscribe form",`
`14`	`14`	`model: model,`
`15`	`15`	`applyChanges: async (updatedModel: ProductSubscribeModel) => {`
`16`		`- Object.assign(model, updatedModel);`
`17`		`- this.modelToViewModel(model, viewModel, bindingContext);`
	`16`	`+ this.modelToViewModel(updatedModel, viewModel, bindingContext);`
`18`	`17`	`}`
`19`	`18`	`};`
`20`	`19`