Align with new fhc api

icc-api/api/XHR.ts

@@ -38,20 +38,15 @@ export namespace XHR {
     url: string,
     init: RequestInit,
     timeout = 10000,
-    fetchImpl: (input: RequestInfo, init?: RequestInit) => Promise<Response> = typeof window !==
-    "undefined"
-      ? window.fetch
-      : typeof self !== "undefined"
-        ? self.fetch
-        : fetch
+    fetchImpl?: (input: RequestInfo, init?: RequestInit) => Promise<Response>
   ): Promise<Response> {
     return new Promise((resolve, reject) => {
       // Set timeout timer
       let timer = setTimeout(
         () => reject({ message: "Request timed out", status: "Request timed out" }),
         timeout
       )
-      fetchImpl(url, init)
+      ;(fetchImpl || window.fetch)(url, init)
         .then(response => {
           clearTimeout(timer)
           resolve(response)
@@ -68,12 +63,7 @@ export namespace XHR {
     url: string,
     headers: Array<Header> | null,
     data: string | any = "",
-    fetchImpl: (input: RequestInfo, init?: RequestInit) => Promise<Response> = typeof window !==
-    "undefined"
-      ? window.fetch
-      : typeof self !== "undefined"
-        ? self.fetch
-        : fetch,
+    fetchImpl?: (input: RequestInfo, init?: RequestInit) => Promise<Response>,
     contentTypeOverride?: "application/json" | "text/plain" | "application/octet-stream"
   ): Promise<Data> {
     const contentType =
@@ -124,7 +114,9 @@ export namespace XHR {
         ? response.json()
         : ct.startsWith("application/xml") || ct.startsWith("text/")
           ? response.text()
-          : response.arrayBuffer()
+          : response.arrayBuffer
+            ? response.arrayBuffer()
+            : response.blob().then(blob => new Response(blob).arrayBuffer())
       ).then(d => new Data(response.status, ct, d))
     })
   }

icc-api/api/iccBekmehrApi.ts → icc-api/api/iccBeKmehrApi.ts

@@ -84,6 +84,7 @@ export class iccBeKmehrApi {
     date?: number,
     language?: string,
     recipientNihii?: string,
+    recipientSsin?: string,
     recipientFirstName?: string,
     recipientLastName?: string,
     mimeType?: string,
@@ -102,6 +103,7 @@ export class iccBeKmehrApi {
       (date ? "&date=" + date : "") +
       (language ? "&language=" + language : "") +
       (recipientNihii ? "&recipientNihii=" + recipientNihii : "") +
+      (recipientSsin ? "&recipientSsin=" + recipientSsin : "") +
       (recipientFirstName ? "&recipientFirstName=" + recipientFirstName : "") +
       (recipientLastName ? "&recipientLastName=" + recipientLastName : "") +
       (mimeType ? "&mimeType=" + mimeType : "")
@@ -141,6 +143,7 @@ export class iccBeKmehrApi {
     date?: number,
     language?: string,
     recipientNihii?: string,
+    recipientSsin?: string,
     recipientFirstName?: string,
     recipientLastName?: string,
     mimeType?: string,
@@ -159,6 +162,7 @@ export class iccBeKmehrApi {
       (date ? "&date=" + date : "") +
       (language ? "&language=" + language : "") +
       (recipientNihii ? "&recipientNihii=" + recipientNihii : "") +
+      (recipientSsin ? "&recipientSsin=" + recipientSsin : "") +
       (recipientFirstName ? "&recipientFirstName=" + recipientFirstName : "") +
       (recipientLastName ? "&recipientLastName=" + recipientLastName : "") +
       (mimeType ? "&mimeType=" + mimeType : "")
@@ -202,6 +206,7 @@ export class iccBeKmehrApi {
     date?: number,
     language?: string,
     recipientNihii?: string,
+    recipientSsin?: string,
     recipientFirstName?: string,
     recipientLastName?: string,
     mimeType?: string,
@@ -220,6 +225,7 @@ export class iccBeKmehrApi {
       (date ? "&date=" + date : "") +
       (language ? "&language=" + language : "") +
       (recipientNihii ? "&recipientNihii=" + recipientNihii : "") +
+      (recipientSsin ? "&recipientSsin=" + recipientSsin : "") +
       (recipientFirstName ? "&recipientFirstName=" + recipientFirstName : "") +
       (recipientLastName ? "&recipientLastName=" + recipientLastName : "") +
       (mimeType ? "&mimeType=" + mimeType : "")
@@ -237,6 +243,7 @@ export class iccBeKmehrApi {
     date?: number,
     language?: string,
     recipientNihii?: string,
+    recipientSsin?: string,
     recipientFirstName?: string,
     recipientLastName?: string,
     mimeType?: string,
@@ -255,6 +262,7 @@ export class iccBeKmehrApi {
       (date ? "&date=" + date : "") +
       (language ? "&language=" + language : "") +
       (recipientNihii ? "&recipientNihii=" + recipientNihii : "") +
+      (recipientSsin ? "&recipientSsin=" + recipientSsin : "") +
       (recipientFirstName ? "&recipientFirstName=" + recipientFirstName : "") +
       (recipientLastName ? "&recipientLastName=" + recipientLastName : "") +
       (mimeType ? "&mimeType=" + mimeType : "")
@@ -272,6 +280,7 @@ export class iccBeKmehrApi {
     date?: number,
     language?: string,
     recipientNihii?: string,
+    recipientSsin?: string,
     recipientFirstName?: string,
     recipientLastName?: string,
     mimeType?: string,
@@ -290,6 +299,7 @@ export class iccBeKmehrApi {
       (date ? "&date=" + date : "") +
       (language ? "&language=" + language : "") +
       (recipientNihii ? "&recipientNihii=" + recipientNihii : "") +
+      (recipientSsin ? "&recipientSsin=" + recipientSsin : "") +
       (recipientFirstName ? "&recipientFirstName=" + recipientFirstName : "") +
       (recipientLastName ? "&recipientLastName=" + recipientLastName : "") +
       (mimeType ? "&mimeType=" + mimeType : "")
@@ -307,6 +317,7 @@ export class iccBeKmehrApi {
     date?: number,
     language?: string,
     recipientNihii?: string,
+    recipientSsin?: string,
     recipientFirstName?: string,
     recipientLastName?: string,
     mimeType?: string,
@@ -325,6 +336,7 @@ export class iccBeKmehrApi {
       (date ? "&date=" + date : "") +
       (language ? "&language=" + language : "") +
       (recipientNihii ? "&recipientNihii=" + recipientNihii : "") +
+      (recipientSsin ? "&recipientSsin=" + recipientSsin : "") +
       (recipientFirstName ? "&recipientFirstName=" + recipientFirstName : "") +
       (recipientLastName ? "&recipientLastName=" + recipientLastName : "") +
       (mimeType ? "&mimeType=" + mimeType : "")
@@ -342,6 +354,7 @@ export class iccBeKmehrApi {
     date?: number,
     language?: string,
     recipientNihii?: string,
+    recipientSsin?: string,
     recipientFirstName?: string,
     recipientLastName?: string,
     mimeType?: string,
@@ -360,6 +373,7 @@ export class iccBeKmehrApi {
       (date ? "&date=" + date : "") +
       (language ? "&language=" + language : "") +
       (recipientNihii ? "&recipientNihii=" + recipientNihii : "") +
+      (recipientSsin ? "&recipientSsin=" + recipientSsin : "") +
       (recipientFirstName ? "&recipientFirstName=" + recipientFirstName : "") +
       (recipientLastName ? "&recipientLastName=" + recipientLastName : "") +
       (mimeType ? "&mimeType=" + mimeType : "")

icc-api/api/iccEntitytemplateApi.ts

@@ -62,6 +62,26 @@ export class iccEntitytemplateApi {
       .then(doc => new models.EntityTemplateDto(doc.body as JSON))
       .catch(err => this.handleError(err))
   }
+
+  deleteEntityTemplate(entityTemplateIds: string): Promise<any> {
+    let _body = null
+
+    const _url =
+      this.host +
+      "/entitytemplate/{entityTemplateIds}".replace(
+        "{entityTemplateIds}",
+        entityTemplateIds + ""
+      ) +
+      "?ts=" +
+      new Date().getTime()
+    let headers = this.headers
+    headers = headers
+      .filter(h => h.header !== "Content-Type")
+      .concat(new XHR.Header("Content-Type", "application/json"))
+    return XHR.sendCommand("DELETE", _url, headers, _body, this.fetchImpl)
+      .catch(err => this.handleError(err))
+  }
+
   findAllEntityTemplates(
     type: string,
     searchString?: string,

icc-api/api/iccIcureApi.ts

@@ -238,14 +238,15 @@ export class iccIcureApi {
       .then(doc => true)
       .catch(err => this.handleError(err))
   }
-  updateDesignDoc(entityName: string): Promise<boolean | any> {
+  updateDesignDoc(entityName: string, warmup = false): Promise<boolean | any> {
     let _body = null
 
     const _url =
       this.host +
       "/icure/dd/{entityName}".replace("{entityName}", entityName + "") +
       "?ts=" +
-      new Date().getTime()
+      new Date().getTime() +
+      (!!warmup ? "&warmup=" + "true" : "false")
     let headers = this.headers
     headers = headers
       .filter(h => h.header !== "Content-Type")

icc-api/api/iccMessageApi.ts

@@ -165,9 +165,9 @@ export class iccMessageApi {
       new Date().getTime() +
       (fromAddress ? "&fromAddress=" + fromAddress : "") +
       (startKey ? "&startKey=" + startKey : "") +
-      (startDocumentId ? "&startDocumentId=" + startDocumentId : "") +
+      (startDocumentId ? "&startDocumentId=" + encodeURIComponent(startDocumentId) : "") +
       (limit ? "&limit=" + limit : "") +
-      (hcpId ? "&hcpId=" + hcpId : "")
+      (hcpId ? "&hcpId=" + encodeURIComponent(hcpId) : "")
     let headers = this.headers
     headers = headers
       .filter(h => h.header !== "Content-Type")
@@ -193,10 +193,10 @@ export class iccMessageApi {
       new Date().getTime() +
       (toAddress ? "&toAddress=" + toAddress : "") +
       (startKey ? "&startKey=" + startKey : "") +
-      (startDocumentId ? "&startDocumentId=" + startDocumentId : "") +
+      (startDocumentId ? "&startDocumentId=" + encodeURIComponent(startDocumentId) : "") +
       (limit ? "&limit=" + limit : "") +
       (reverse ? "&reverse=" + reverse : "") +
-      (hcpId ? "&hcpId=" + hcpId : "")
+      (hcpId ? "&hcpId=" + encodeURIComponent(hcpId) : "")
     let headers = this.headers
     headers = headers
       .filter(h => h.header !== "Content-Type")
@@ -223,9 +223,9 @@ export class iccMessageApi {
       (transportGuid ? "&transportGuid=" + transportGuid : "") +
       (received ? "&received=" + received : "") +
       (startKey ? "&startKey=" + startKey : "") +
-      (startDocumentId ? "&startDocumentId=" + startDocumentId : "") +
+      (startDocumentId ? "&startDocumentId=" + encodeURIComponent(startDocumentId) : "") +
       (limit ? "&limit=" + limit : "") +
-      (hcpId ? "&hcpId=" + hcpId : "")
+      (hcpId ? "&hcpId=" + encodeURIComponent(hcpId) : "")
     let headers = this.headers
     headers = headers
       .filter(h => h.header !== "Content-Type")
@@ -254,9 +254,9 @@ export class iccMessageApi {
       (from ? "&from=" + from : "") +
       (to ? "&to=" + to : "") +
       (startKey ? "&startKey=" + startKey : "") +
-      (startDocumentId ? "&startDocumentId=" + startDocumentId : "") +
+      (startDocumentId ? "&startDocumentId=" + encodeURIComponent(startDocumentId) : "") +
       (limit ? "&limit=" + limit : "") +
-      (hcpId ? "&hcpId=" + hcpId : "")
+      (hcpId ? "&hcpId=" + encodeURIComponent(hcpId) : "")
     let headers = this.headers
     headers = headers
       .filter(h => h.header !== "Content-Type")