@smartsoft001-mobilems/angular 1.0.62 → 1.0.63
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -27,7 +27,7 @@ export class CrudBaseService extends CrudService {
|
|
|
27
27
|
if (filter?.offset && filter?.limit) {
|
|
28
28
|
page = filter.offset / filter.limit;
|
|
29
29
|
}
|
|
30
|
-
let url =
|
|
30
|
+
let url = this.getBaseListUrl(page, filter);
|
|
31
31
|
if (filter?.searchText) {
|
|
32
32
|
url += `&filter[phrase]=${filter.searchText}`;
|
|
33
33
|
}
|
|
@@ -56,6 +56,12 @@ export class CrudBaseService extends CrudService {
|
|
|
56
56
|
};
|
|
57
57
|
}), catchError(this.handleError));
|
|
58
58
|
}
|
|
59
|
+
getBaseListUrl(page, filter) {
|
|
60
|
+
let url = `${this.config.apiUrl}${this.getUrlNameForList() !== "public-collections"
|
|
61
|
+
? "search/" + this.getUrlNameForList()
|
|
62
|
+
: "public-collections"}/page/${page}?maxPerPage=${filter?.limit}`;
|
|
63
|
+
return url;
|
|
64
|
+
}
|
|
59
65
|
handleError(err) {
|
|
60
66
|
if (err.status === 404 || err.status === 406) {
|
|
61
67
|
return of({
|
|
@@ -79,4 +85,4 @@ export class CrudBaseService extends CrudService {
|
|
|
79
85
|
}
|
|
80
86
|
}
|
|
81
87
|
}
|
|
82
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
88
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"crud.service.js","sourceRoot":"","sources":["../../../../../../../../libs/shared/angular/src/lib/services/crud/crud.service.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  CrudConfig,\n  CrudService,\n  ICrudFilter,\n} from \"@smartsoft001/crud-shell-angular\";\nimport { HttpClient } from \"@angular/common/http\";\nimport { IEntity } from \"@smartsoft001/domain-core\";\nimport { Observable, of, throwError } from \"rxjs\";\nimport { catchError, map } from \"rxjs/operators\";\n\nexport abstract class CrudBaseService<\n  T extends IEntity<any>\n> extends CrudService<T> {\n  abstract getUrlNameForDetails(): string;\n  abstract getUrlNameForList(): string;\n\n  constructor(config: CrudConfig<T>, httpClient: HttpClient) {\n    super(config, httpClient, null as any);\n  }\n\n  downloadPdf(name: string, id: string): Promise<void> {\n    return fetch(\n      this.config.apiUrl + this.getUrlNameForDetails() + \"/\" + id + \"/pdf\"\n    )\n      .then((resp) => resp.arrayBuffer())\n      .then((resp) => {\n        const file = new Blob([resp], { type: \"application/pdf\" });\n\n        const fileURL = URL.createObjectURL(file);\n        const link = document.createElement(\"a\");\n        link.href = fileURL;\n        link.download = name + \".pdf\";\n        link.click();\n      });\n  }\n\n  getById(id: string): Observable<T> {\n    return this.http\n      .get<{ data: T }>(\n        this.config.apiUrl + this.getUrlNameForDetails() + \"/\" + id\n      )\n      .pipe(map((r) => r?.data));\n  }\n\n  getList(\n    filter?: ICrudFilter\n  ): Observable<{ data: T[]; totalCount: number; links: any }> {\n    let page = 1;\n\n    if (filter?.offset && filter?.limit) {\n      page = filter.offset / filter.limit;\n    }\n\n    let url = this.getBaseListUrl(page, filter as { limit: number });\n\n    if (filter?.searchText) {\n      url += `&filter[phrase]=${filter.searchText}`;\n    }\n\n    if (filter?.sortBy) {\n      url += `&sort=${filter.sortBy}-${filter.sortDesc ? \"desc\" : \"asc\"}`;\n    } else {\n      url += `&sort=random`;\n    }\n\n    filter?.query?.forEach((q) => {\n      const isArray = Array.isArray(q.value);\n\n      if (isArray) {\n        q.value.forEach((value: any) => {\n          url += `&filter[${q.key}]${this.getQueryType(q.type, true)}=${\n            value.id\n          }`;\n        });\n      } else {\n        url += `&filter[${q.key}]${this.getQueryType(q.type, false)}=${\n          q.value\n        }`;\n      }\n    });\n\n    return this.http.get<{ data: any }>(url).pipe(\n      map((r) => {\n        return {\n          data: r.data.items,\n          totalCount: r.data.paginatorDetails.totalItemsCount,\n          links: {},\n        };\n      }),\n      catchError(this.handleError)\n    );\n  }\n\n  protected getBaseListUrl(\n    page: number,\n    filter: {\n      limit: number;\n    }\n  ) {\n    let url = `${this.config.apiUrl}${\n      this.getUrlNameForList() !== \"public-collections\"\n        ? \"search/\" + this.getUrlNameForList()\n        : \"public-collections\"\n    }/page/${page}?maxPerPage=${filter?.limit}`;\n    return url;\n  }\n\n  protected handleError(err: any): Observable<any> {\n    if (err.status === 404 || err.status === 406) {\n      return of({\n        data: [],\n        totalCount: 0,\n        links: {},\n      });\n    }\n\n    return throwError(err);\n  }\n\n  protected getQueryType(\n    type: \"=\" | \"!=\" | \">=\" | \"<=\" | \"<\" | \">\",\n    isArray: boolean\n  ) {\n    switch (type) {\n      case \">=\":\n        return \"[from]\";\n      case \"<=\":\n        return \"[to]\";\n      case \"=\":\n        return isArray ? \"[]\" : \"\";\n      default:\n        throw \"not support type\";\n    }\n  }\n}\n"]}
|
|
@@ -13,6 +13,9 @@ export declare abstract class CrudBaseService<T extends IEntity<any>> extends Cr
|
|
|
13
13
|
totalCount: number;
|
|
14
14
|
links: any;
|
|
15
15
|
}>;
|
|
16
|
+
protected getBaseListUrl(page: number, filter: {
|
|
17
|
+
limit: number;
|
|
18
|
+
}): string;
|
|
16
19
|
protected handleError(err: any): Observable<any>;
|
|
17
20
|
protected getQueryType(type: "=" | "!=" | ">=" | "<=" | "<" | ">", isArray: boolean): "" | "[from]" | "[to]" | "[]";
|
|
18
21
|
}
|
package/package.json
CHANGED