@csmart/ngc-smart-core 1.13.7 → 1.13.9

package/fesm2020/csmart-ngc-smart-core.mjs

@@ -613,40 +613,41 @@ class SmartStaffOffenderOptionsService {
             return;
         }
         if (jsonObject instanceof Array) {
-            jsonObject.forEach(obj => {
+            jsonObject.forEach((obj) => {
                 this.convertEmptyToNull(obj);
             });
         }
         const keys = Object.keys(jsonObject);
-        keys.forEach(key => {
+        keys.forEach((key) => {
             if (typeof jsonObject[key] === 'object') {
                 this.convertEmptyToNull(jsonObject[key]);
             }
-            else if (typeof jsonObject[key] === 'string' && jsonObject[key].trim() === '') {
+            else if (typeof jsonObject[key] === 'string' &&
+                jsonObject[key].trim() === '') {
                 jsonObject[key] = null;
             }
         });
     }
     getGraphQueryData(queryName, queryString) {
-        return this.http
-            .post(this.serviceApiUrl, { query: queryString })
-            .pipe(map(({ data }) => {
+        return this.http.post(this.serviceApiUrl, { query: queryString }).pipe(map(({ data }) => {
             return data[queryName];
         }));
     }
     getOffenderListOptions() {
-        const queryName = 'findOffenderListOptions';
-        const queryString = `{
-      ${queryName} {
-        data {
-          offenderListOptionId
+        const queryString = `{findOffenderListOptions(input:{
+      where:{
+        deactivatedDate: null
+      }
+    }){
+      data{
+        offenderListOptionId
           name
           serviceApiFieldName
-        }
-        message
       }
-    }`;
-        return this.getGraphQueryData(queryName, queryString);
+  } }`;
+        return this.http.post(this.serviceApiUrl, { query: queryString }).pipe(map(({ data }) => {
+            return data['findOffenderListOptions'];
+        }));
     }
     getStaffOffenderListOptions(staffId) {
         const queryString = `{findStaffOffenderListOptions(input:{
@@ -658,13 +659,12 @@ class SmartStaffOffenderOptionsService {
         offenderListOptionId
       }
   } }`;
-        return this.http
-            .post(this.serviceApiUrl, { query: queryString })
-            .pipe(map(({ data }) => {
+        return this.http.post(this.serviceApiUrl, { query: queryString }).pipe(map(({ data }) => {
             return data.findStaffOffenderListOptions.data;
         }));
     }
     saveStaffOffenderListOptionsData(dataToSave) {
+        //}: Observable<any> {
         // this.convertEmptyToNull(dataToSave);
         const queryName = 'upsertStaffOffenderListOption';
         const query = `mutation  {
@@ -672,9 +672,7 @@ class SmartStaffOffenderOptionsService {
             message
           }
         }`;
-        ;
-        return this.http
-            .post(this.serviceApiUrl, { query });
+        return this.http.post(this.serviceApiUrl, { query });
         /*.pipe(
           map(({ data }) => {
             return data[queryName];
@@ -687,7 +685,7 @@ class SmartStaffOffenderOptionsService {
         }
         if (obj instanceof Array) {
             result += ' [';
-            obj.forEach(eObj => {
+            obj.forEach((eObj) => {
                 result += this.convertToString(eObj);
             });
             result += '],';