@rws-framework/client 2.22.0 → 2.23.0

package/src/services/_api/backend.ts

@@ -2,7 +2,7 @@ import { ApiServiceInstance, IBackendRoute, IHTTProute } from "../ApiService";
 import { ConfigServiceInstance } from "../ConfigService";
 
 export const backend = {
-    getBackendUrl(this: ApiServiceInstance, routeName: string, params: {[key: string]: string} = {}): string
+    getBackendUrl(this: ApiServiceInstance, routeName: string, params: {[key: string]: string} = {}, queryParams: {[key: string]: string} = {}): string
     {       
         const config = this.config;
         const routesPackage = config.get('backendRoutes');
@@ -43,13 +43,12 @@ export const backend = {
                     ];
                 }
 
-                routes = [...routes, ...item.routes.map((subRouteItem: IHTTProute): IHTTProute => {
+                    routes = [...routes, ...item.routes.map((subRouteItem: IHTTProute): IHTTProute => {
                     const subRoute: IHTTProute = {
-                        path: item.prefix + subRouteItem.path,
+                        path: Array.isArray(subRouteItem.path) ? subRouteItem.path.map(subPath => item.prefix + subPath) : item.prefix + subRouteItem.path,
                         name: backend.checkPrefixedRouteName(subRouteItem.name, item.controllerName),
                         method: subRouteItem.method || 'GET'
-                    };
-            
+                    };            
                     return subRoute;
                 })];
 
@@ -65,15 +64,48 @@ export const backend = {
             throw new Error(`Backend route '${routeName}' does not exist.`);
         }
 
-        let apiPath = route.path;
+        let apiPath: string | string[] = route.path;        
+
+        if(Array.isArray(apiPath)){
+            const paramsLength = Object.keys(params).length;
+            if(paramsLength > 0){               
+                for(const searchedPath of apiPath){
+                    let foundParams = 0;
+                    for(const p of Object.keys(params)){
+                        if(searchedPath.indexOf(`:${p}`) !== -1){
+                            foundParams++;
+                        }
+                    }
+
+                    if(foundParams === paramsLength){
+                        apiPath = searchedPath;
+                        break;
+                    }
+                }
+            }else{
+                for(const searchedPath of apiPath){
+                    if(!searchedPath.includes(':')){
+                        apiPath = searchedPath;
+                        break;
+                    }
+                }
+            }
+        }
 
         Object.keys(params).forEach((paramKey: string) => {
             const paramValue = params[paramKey];
 
-            apiPath = apiPath.replace(`:${paramKey}`, paramValue);
-        });
+            apiPath = (apiPath as string).replace(`:${paramKey}`, paramValue);
+        });        
+
+        let finalUrl = `${config.get('backendUrl')}${config.get('apiPrefix') || ''}${apiPath}`;
+
+        if(Object.keys(queryParams).length > 0){
+            const queryString = new URLSearchParams(queryParams).toString();
+            finalUrl += `?${queryString}`;
+        }
 
-        return `${config.get('backendUrl')}${config.get('apiPrefix') || ''}${apiPath}`;
+        return finalUrl;
     },
     checkPrefixedRouteName(routeName: string, prefixName: string){
         let finalRoute = routeName;

package/src/types/IRWSViewComponent.ts

@@ -1,9 +1,9 @@
-import { ViewTemplate } from '@microsoft/fast-element';
+import { FASTElement, ViewTemplate } from '@microsoft/fast-element';
 import { DOMOutputType } from '../services/DOMService';
 
 type IAssetShowOptions = Record<string, any>;
 
-interface IRWSViewComponent extends Node {    
+interface IRWSViewComponent extends FASTElement {    
     __isLoading: boolean;
     routeParams: Record<string, string>;
     trashIterator: number;

package/src/types/IBackendCore.ts

@@ -1,12 +0,0 @@
-export interface IKDBTypeInfo {
-    fieldName: string;
-    type: string;
-    boundModel?: string
-}
-
-export interface IKDBTypesResponse {
-    success: boolean;
-    data: {
-        types: IKDBTypeInfo[];
-    };
-}

package/src/types/IRWSResource.ts

@@ -1,5 +0,0 @@
-export interface IRWSResourceQuery {
-    fieldName: string,
-    type: String,
-    boundModel: string
-}

package/src/types/IReFormerField.ts

@@ -1,5 +0,0 @@
-export interface IReFormerField {
-    name: string,
-    defaultValue?: any,
-    setForm: (field: string, value: any) => Promise<void>   
-}