Altering condition to be optimal

nikithauc · zengin · web-flow · commit b946955d6c66 · 2020-07-29T11:14:15.000-07:00
Co-authored-by: Mustafa Zengin &lt;muzengin@microsoft.com&gt;
diff --git a/src/GraphRequest.ts b/src/GraphRequest.ts
@@ -512,7 +512,7 @@ export class GraphRequest {
 		}
 		if (oDataQueryNames.indexOf(paramKey) !== -1) {
 			const currentValue = this.urlComponents.oDataQueryParams[paramKey];
-			const isValueAppendable = (paramKey === "$expand" || paramKey === "$select" || paramKey === "$orderby") && currentValue;
+			const isValueAppendable = currentValue && (paramKey === "$expand" || paramKey === "$select" || paramKey === "$orderby");
 			this.urlComponents.oDataQueryParams[paramKey] = isValueAppendable ? currentValue + "," + paramValue : paramValue;
 		} else {
 			this.urlComponents.otherURLQueryParams[paramKey] = paramValue;

Original file line number	Diff line number	Diff line change
`@@ -512,7 +512,7 @@ export class GraphRequest {`
`512`	`512`	`}`
`513`	`513`	`if (oDataQueryNames.indexOf(paramKey) !== -1) {`
`514`	`514`	`const currentValue = this.urlComponents.oDataQueryParams[paramKey];`
`515`		`- const isValueAppendable = (paramKey === "$expand" \|\| paramKey === "$select" \|\| paramKey === "$orderby") && currentValue;`
	`515`	`+ const isValueAppendable = currentValue && (paramKey === "$expand" \|\| paramKey === "$select" \|\| paramKey === "$orderby");`
`516`	`516`	`this.urlComponents.oDataQueryParams[paramKey] = isValueAppendable ? currentValue + "," + paramValue : paramValue;`
`517`	`517`	`} else {`
`518`	`518`	`this.urlComponents.otherURLQueryParams[paramKey] = paramValue;`