bx-rest 0.4.5 → 0.4.6
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.
- package/esm2022/request/disk/file.mjs +7 -7
- package/esm2022/request/disk/storage.mjs +16 -16
- package/esm2022/request-navvy/disk/file.mjs +3 -3
- package/esm2022/request-navvy/disk/interlayer/storage.mjs +11 -11
- package/esm2022/request-navvy/disk/operation.mjs +7 -10
- package/esm2022/request-navvy/disk/storage.mjs +9 -9
- package/esm2022/request-navvy/task/elapseditem.mjs +5 -5
- package/esm2022/request-navvy/task.mjs +6 -6
- package/esm2022/typification/rest/task/commentitem/add.mjs +1 -1
- package/fesm2022/bx-rest.mjs +56 -59
- package/fesm2022/bx-rest.mjs.map +1 -1
- package/package.json +1 -1
- package/request/disk/file.d.ts +5 -5
- package/request/disk/folder.d.ts +1 -1
- package/request/disk/storage.d.ts +11 -11
- package/request-navvy/disk/file.d.ts +1 -1
- package/request-navvy/disk/folder.d.ts +1 -1
- package/request-navvy/disk/interlayer/storage.d.ts +4 -4
- package/request-navvy/disk/storage.d.ts +4 -4
- package/request-navvy/task/elapseditem.d.ts +3 -3
- package/request-navvy/task.d.ts +4 -4
- package/request-navvy/tasks/task.d.ts +1 -1
- package/typification/rest/task/commentitem/add.d.ts +9 -1
package/fesm2022/bx-rest.mjs
CHANGED
|
@@ -1807,15 +1807,15 @@ class BXRestDiskFile {
|
|
|
1807
1807
|
constructor(http) {
|
|
1808
1808
|
this.http = http;
|
|
1809
1809
|
this.url = {
|
|
1810
|
-
|
|
1810
|
+
getFields: [$disk, $file, $getFields],
|
|
1811
1811
|
get: [$disk, $file, $get],
|
|
1812
1812
|
rename: [$disk, $file, $rename],
|
|
1813
|
-
|
|
1813
|
+
copyTo: [$disk, $file, $copyto],
|
|
1814
1814
|
moveto: [$disk, $file, $moveto],
|
|
1815
1815
|
delete: [$disk, $file, $delete],
|
|
1816
|
-
|
|
1816
|
+
markDeleted: [$disk, $file, $markdeleted],
|
|
1817
1817
|
restore: [$disk, $file, $restore],
|
|
1818
|
-
|
|
1818
|
+
uploadVersion: [$disk, $file, 'uploadversion'],
|
|
1819
1819
|
getVersions: [$disk, $file, 'getVersions'],
|
|
1820
1820
|
restoreFromVersion: [$disk, $file, 'restoreFromVersion'],
|
|
1821
1821
|
getExternalLink: [$disk, $file, 'getexternallink'] // Возвращает публичную ссылку на файл
|
|
@@ -1824,8 +1824,8 @@ class BXRestDiskFile {
|
|
|
1824
1824
|
get(id) {
|
|
1825
1825
|
return this.http.post(this.url.get, { id: id });
|
|
1826
1826
|
}
|
|
1827
|
-
|
|
1828
|
-
return this.http.post(this.url.
|
|
1827
|
+
markDeleted(id) {
|
|
1828
|
+
return this.http.post(this.url.markDeleted, { id: id });
|
|
1829
1829
|
}
|
|
1830
1830
|
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRestDiskFile, deps: [{ token: HttpBXServices }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
1831
1831
|
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRestDiskFile, providedIn: 'root' }); }
|
|
@@ -3452,7 +3452,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.11", ngImpo
|
|
|
3452
3452
|
}]
|
|
3453
3453
|
}], ctorParameters: function () { return [{ type: HttpBXServices }, { type: BXRestNavvyDelegateElapsedItem }, { type: BXRestMapTaskElapsedItem }, { type: BXRestNavvyUser }, { type: BXRestNavvyTasks }]; } });
|
|
3454
3454
|
|
|
3455
|
-
class
|
|
3455
|
+
class BXRestNavvyElapsedItem {
|
|
3456
3456
|
constructor(BXRestElapsedItem, BXRestMapElapsedItem, delegate, operation) {
|
|
3457
3457
|
this.BXRestElapsedItem = BXRestElapsedItem;
|
|
3458
3458
|
this.BXRestMapElapsedItem = BXRestMapElapsedItem;
|
|
@@ -3638,10 +3638,10 @@ class BXRestNavvyElapseditem {
|
|
|
3638
3638
|
}
|
|
3639
3639
|
})), v => (v === null));
|
|
3640
3640
|
}
|
|
3641
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type:
|
|
3642
|
-
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type:
|
|
3641
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRestNavvyElapsedItem, deps: [{ token: BXRestTaskElapsedItem }, { token: BXRestMapTaskElapsedItem }, { token: BXRestNavvyDelegateElapsedItem }, { token: BXRestNavvyOperationElapsedItem }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
3642
|
+
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRestNavvyElapsedItem, providedIn: 'root' }); }
|
|
3643
3643
|
}
|
|
3644
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type:
|
|
3644
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRestNavvyElapsedItem, decorators: [{
|
|
3645
3645
|
type: Injectable,
|
|
3646
3646
|
args: [{
|
|
3647
3647
|
providedIn: 'root'
|
|
@@ -3779,12 +3779,12 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.11", ngImpo
|
|
|
3779
3779
|
}], ctorParameters: function () { return [{ type: BXRestTaskPlanner }, { type: BXRestMapTaskPlaner }]; } });
|
|
3780
3780
|
|
|
3781
3781
|
class BXRestNavvyTask {
|
|
3782
|
-
constructor(
|
|
3783
|
-
this.
|
|
3784
|
-
this.
|
|
3782
|
+
constructor(elapsedItem, commentItem, planner) {
|
|
3783
|
+
this.elapsedItem = elapsedItem;
|
|
3784
|
+
this.commentItem = commentItem;
|
|
3785
3785
|
this.planner = planner;
|
|
3786
3786
|
}
|
|
3787
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRestNavvyTask, deps: [{ token:
|
|
3787
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRestNavvyTask, deps: [{ token: BXRestNavvyElapsedItem }, { token: BXRestNavvyTaskCommentItem }, { token: BXRestNavvyTaskPlanner }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
3788
3788
|
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRestNavvyTask, providedIn: 'root' }); }
|
|
3789
3789
|
}
|
|
3790
3790
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRestNavvyTask, decorators: [{
|
|
@@ -3792,7 +3792,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.11", ngImpo
|
|
|
3792
3792
|
args: [{
|
|
3793
3793
|
providedIn: 'root'
|
|
3794
3794
|
}]
|
|
3795
|
-
}], ctorParameters: function () { return [{ type:
|
|
3795
|
+
}], ctorParameters: function () { return [{ type: BXRestNavvyElapsedItem }, { type: BXRestNavvyTaskCommentItem }, { type: BXRestNavvyTaskPlanner }]; } });
|
|
3796
3796
|
|
|
3797
3797
|
class BXRestMapDiskBase extends BaseMapServices {
|
|
3798
3798
|
separationFoldersAndFiles(arr) {
|
|
@@ -4017,8 +4017,8 @@ class BXRestNavvyDiskFile {
|
|
|
4017
4017
|
get(id) {
|
|
4018
4018
|
return this.Navvy.simpleWithArg(this.BXRestDiskFile.get, id, this.BXRestMapDiskFile.get);
|
|
4019
4019
|
}
|
|
4020
|
-
|
|
4021
|
-
return this.Navvy.simpleWithArg(this.BXRestDiskFile.
|
|
4020
|
+
markDeleted(id) {
|
|
4021
|
+
return this.Navvy.simpleWithArg(this.BXRestDiskFile.markDeleted, id, this.BXRestMapDiskFile.markdeleted);
|
|
4022
4022
|
}
|
|
4023
4023
|
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRestNavvyDiskFile, deps: [{ token: BXRestDiskFile }, { token: BXRestMapDiskFile }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
4024
4024
|
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRestNavvyDiskFile, providedIn: 'root' }); }
|
|
@@ -4051,32 +4051,32 @@ class BXRestDiskStorage {
|
|
|
4051
4051
|
constructor(http) {
|
|
4052
4052
|
this.http = http;
|
|
4053
4053
|
this.url = {
|
|
4054
|
-
|
|
4054
|
+
getFields: [$disk, $storage, $getFields],
|
|
4055
4055
|
get: [$disk, $storage, $get],
|
|
4056
4056
|
rename: [$disk, $storage, $rename],
|
|
4057
4057
|
// Допустимо переименование только хранилища приложения (см. disk.storage.getforapp)
|
|
4058
|
-
|
|
4059
|
-
|
|
4060
|
-
|
|
4061
|
-
|
|
4058
|
+
getList: [$disk, $storage, $getlist],
|
|
4059
|
+
getTypes: [$disk, $storage, $getTypes],
|
|
4060
|
+
addFolder: [$disk, $storage, 'addfolder'],
|
|
4061
|
+
getChildren: [$disk, $storage, $getchildren],
|
|
4062
4062
|
// которые находятся непосредственно в корне хранилища
|
|
4063
|
-
|
|
4064
|
-
|
|
4063
|
+
uploadFile: [$disk, $storage, $uploadfile],
|
|
4064
|
+
getForApp: [$disk, $storage, 'getforapp'] // Возвращает описание хранилища,
|
|
4065
4065
|
// с которым может работать приложение для хранения своих данных (файлов и папок)
|
|
4066
4066
|
};
|
|
4067
4067
|
}
|
|
4068
|
-
|
|
4069
|
-
return this.http.post(this.url.
|
|
4068
|
+
getForApp() {
|
|
4069
|
+
return this.http.post(this.url.getForApp, {});
|
|
4070
4070
|
}
|
|
4071
|
-
|
|
4072
|
-
return this.http.post(this.url.
|
|
4071
|
+
getChildren(param) {
|
|
4072
|
+
return this.http.post(this.url.getChildren, param);
|
|
4073
4073
|
}
|
|
4074
4074
|
// TODO: Сделать нормальное описание параметров
|
|
4075
|
-
|
|
4076
|
-
return this.http.post(this.url.
|
|
4075
|
+
addFolder(param) {
|
|
4076
|
+
return this.http.post(this.url.addFolder, param);
|
|
4077
4077
|
}
|
|
4078
|
-
|
|
4079
|
-
return this.http.post(this.url.
|
|
4078
|
+
uploadFile(param) {
|
|
4079
|
+
return this.http.post(this.url.uploadFile, param);
|
|
4080
4080
|
}
|
|
4081
4081
|
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRestDiskStorage, deps: [{ token: HttpBXServices }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
4082
4082
|
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRestDiskStorage, providedIn: 'root' }); }
|
|
@@ -4092,15 +4092,15 @@ class BXRestNavvyInterlayerDiskStorage {
|
|
|
4092
4092
|
constructor(BXRestDiskStorage) {
|
|
4093
4093
|
this.BXRestDiskStorage = BXRestDiskStorage;
|
|
4094
4094
|
}
|
|
4095
|
-
|
|
4096
|
-
let res = SessionStorage.getItem(this.constructor.name + this.
|
|
4095
|
+
getForApp() {
|
|
4096
|
+
let res = SessionStorage.getItem(this.constructor.name + this.getForApp.name);
|
|
4097
4097
|
if (res) {
|
|
4098
4098
|
return of(res);
|
|
4099
4099
|
}
|
|
4100
4100
|
else {
|
|
4101
|
-
return this.BXRestDiskStorage.
|
|
4101
|
+
return this.BXRestDiskStorage.getForApp().pipe(tap(v => {
|
|
4102
4102
|
if (v) {
|
|
4103
|
-
SessionStorage.setItem(this.constructor.name + this.
|
|
4103
|
+
SessionStorage.setItem(this.constructor.name + this.getForApp.name, v);
|
|
4104
4104
|
}
|
|
4105
4105
|
}), shareReplay(1));
|
|
4106
4106
|
}
|
|
@@ -4123,15 +4123,15 @@ class BXRestNavvyInterlayerDiskStorage {
|
|
|
4123
4123
|
}
|
|
4124
4124
|
}
|
|
4125
4125
|
*/
|
|
4126
|
-
|
|
4127
|
-
return this.BXRestDiskStorage.
|
|
4126
|
+
getChildren(param) {
|
|
4127
|
+
return this.BXRestDiskStorage.getChildren(param);
|
|
4128
4128
|
}
|
|
4129
4129
|
// TODO: разобраться что возвращает и что вставлять
|
|
4130
|
-
|
|
4131
|
-
return this.BXRestDiskStorage.
|
|
4130
|
+
addFolder(param) {
|
|
4131
|
+
return this.BXRestDiskStorage.addFolder(param);
|
|
4132
4132
|
}
|
|
4133
|
-
|
|
4134
|
-
return this.BXRestDiskStorage.
|
|
4133
|
+
uploadFile(param) {
|
|
4134
|
+
return this.BXRestDiskStorage.uploadFile(param);
|
|
4135
4135
|
}
|
|
4136
4136
|
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRestNavvyInterlayerDiskStorage, deps: [{ token: BXRestDiskStorage }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
4137
4137
|
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRestNavvyInterlayerDiskStorage, providedIn: 'root' }); }
|
|
@@ -4149,8 +4149,8 @@ class BXRestNavvyDiskStorage {
|
|
|
4149
4149
|
this.BXRestMapDiskStorage = BXRestMapDiskStorage;
|
|
4150
4150
|
this.Navvy = new Navvy(this.BXRestNavvyInterlayerDiskStorage, this.BXRestMapDiskStorage);
|
|
4151
4151
|
}
|
|
4152
|
-
|
|
4153
|
-
return this.Navvy.simple(this.BXRestNavvyInterlayerDiskStorage.
|
|
4152
|
+
getForApp() {
|
|
4153
|
+
return this.Navvy.simple(this.BXRestNavvyInterlayerDiskStorage.getForApp);
|
|
4154
4154
|
}
|
|
4155
4155
|
/*
|
|
4156
4156
|
private getforappEnd(){
|
|
@@ -4170,14 +4170,14 @@ class BXRestNavvyDiskStorage {
|
|
|
4170
4170
|
}
|
|
4171
4171
|
}
|
|
4172
4172
|
*/
|
|
4173
|
-
|
|
4174
|
-
return this.Navvy.simpleWithArg(this.BXRestNavvyInterlayerDiskStorage.
|
|
4173
|
+
getChildren(param) {
|
|
4174
|
+
return this.Navvy.simpleWithArg(this.BXRestNavvyInterlayerDiskStorage.getChildren, param, this.BXRestMapDiskStorage.getchildren);
|
|
4175
4175
|
}
|
|
4176
|
-
|
|
4177
|
-
return this.Navvy.simpleWithArg(this.BXRestNavvyInterlayerDiskStorage.
|
|
4176
|
+
addFolder(param) {
|
|
4177
|
+
return this.Navvy.simpleWithArg(this.BXRestNavvyInterlayerDiskStorage.addFolder, param, this.BXRestMapDiskStorage.addfolder);
|
|
4178
4178
|
}
|
|
4179
|
-
|
|
4180
|
-
return this.Navvy.simpleWithArg(this.BXRestNavvyInterlayerDiskStorage.
|
|
4179
|
+
uploadFile(param) {
|
|
4180
|
+
return this.Navvy.simpleWithArg(this.BXRestNavvyInterlayerDiskStorage.uploadFile, param);
|
|
4181
4181
|
}
|
|
4182
4182
|
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRestNavvyDiskStorage, deps: [{ token: BXRestNavvyInterlayerDiskStorage }, { token: BXRestMapDiskStorage }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
4183
4183
|
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRestNavvyDiskStorage, providedIn: 'root' }); }
|
|
@@ -4197,9 +4197,9 @@ class BXRestNavvyDiskOperation {
|
|
|
4197
4197
|
}
|
|
4198
4198
|
// данные файла в base64
|
|
4199
4199
|
loadFileInAppFolder(file) {
|
|
4200
|
-
return this.storage.
|
|
4200
|
+
return this.storage.getForApp().result().pipe(mergeMap$1(infoFolder => {
|
|
4201
4201
|
if (infoFolder) {
|
|
4202
|
-
return this.storage.
|
|
4202
|
+
return this.storage.uploadFile({
|
|
4203
4203
|
id: infoFolder.ID,
|
|
4204
4204
|
fileContent: [file.name, file.val],
|
|
4205
4205
|
data: {
|
|
@@ -4227,15 +4227,12 @@ class BXRestNavvyDiskOperation {
|
|
|
4227
4227
|
// if (saveData.content.root.app) {
|
|
4228
4228
|
// return of(saveData.content.root.app)
|
|
4229
4229
|
// }
|
|
4230
|
-
return this.storage.
|
|
4230
|
+
return this.storage.getForApp().result().pipe(mergeMap$1(v => {
|
|
4231
4231
|
if (v && v.ID) {
|
|
4232
|
-
return this.storage.
|
|
4232
|
+
return this.storage.getChildren({ id: v.ID }).result();
|
|
4233
4233
|
}
|
|
4234
4234
|
return of(undefined);
|
|
4235
4235
|
}));
|
|
4236
|
-
// }
|
|
4237
|
-
// )
|
|
4238
|
-
// )
|
|
4239
4236
|
}
|
|
4240
4237
|
/**
|
|
4241
4238
|
* Получать или создать папку, если её нет, с определенным именем для приложения
|
|
@@ -4251,9 +4248,9 @@ class BXRestNavvyDiskOperation {
|
|
|
4251
4248
|
}
|
|
4252
4249
|
}
|
|
4253
4250
|
}
|
|
4254
|
-
return this.storage.
|
|
4251
|
+
return this.storage.getForApp().result().pipe(mergeMap$1(v => {
|
|
4255
4252
|
if (v && v.ID) {
|
|
4256
|
-
return this.storage.
|
|
4253
|
+
return this.storage.addFolder({ id: v.ID, data: { NAME: folderName } }).result();
|
|
4257
4254
|
}
|
|
4258
4255
|
return throwError(() => new Error('Отсутствуют права добавление записи затраченного времени'));
|
|
4259
4256
|
}));
|