namirasoft-alarm 1.4.1 → 1.4.2
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/dist/NamirasoftAlarmServerAlarm.d.ts +1 -1
- package/dist/NamirasoftAlarmServerAlarm.js +2 -2
- package/dist/NamirasoftAlarmServerAlarm.js.map +1 -1
- package/dist/NamirasoftAlarmServerBase.js +1 -1
- package/dist/command/AlarmListCommand.js +2 -2
- package/dist/command/AlarmListCommand.js.map +1 -1
- package/package.json +2 -2
- package/src/NamirasoftAlarmServerAlarm.ts +2 -2
- package/src/NamirasoftAlarmServerBase.ts +1 -1
- package/src/command/AlarmListCommand.ts +2 -2
|
@@ -5,7 +5,7 @@ import { NamirasoftAlarmServerBase } from "./NamirasoftAlarmServerBase";
|
|
|
5
5
|
import { TokenManager } from "namirasoft-account";
|
|
6
6
|
export declare class NamirasoftAlarmServerAlarm extends NamirasoftAlarmServerBase {
|
|
7
7
|
constructor(base_url: string, manager: TokenManager, onError: (error: Error) => void);
|
|
8
|
-
List(filters: FilterItem[] | null, page: (number | null), size: (number | null)): Promise<{
|
|
8
|
+
List(filters: FilterItem[] | null, page: (number | null), size: (number | null), user_id: (string | null)): Promise<{
|
|
9
9
|
rows: AlarmRow[];
|
|
10
10
|
count: number;
|
|
11
11
|
}>;
|
|
@@ -21,11 +21,11 @@ class NamirasoftAlarmServerAlarm extends NamirasoftAlarmServerBase_1.NamirasoftA
|
|
|
21
21
|
this.Update = this.Update.bind(this);
|
|
22
22
|
this.Delete = this.Delete.bind(this);
|
|
23
23
|
}
|
|
24
|
-
List(filters, page, size) {
|
|
24
|
+
List(filters, page, size, user_id) {
|
|
25
25
|
return __awaiter(this, void 0, void 0, function* () {
|
|
26
26
|
let filters_string_value = namirasoft_core_1.FilterItem.stringify(filters);
|
|
27
27
|
let path = `/alarm/list`;
|
|
28
|
-
let { data } = yield this._get(path, { filters: filters_string_value, page, size });
|
|
28
|
+
let { data } = yield this._get(path, { filters: filters_string_value, page, size, user_id });
|
|
29
29
|
return data;
|
|
30
30
|
});
|
|
31
31
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NamirasoftAlarmServerAlarm.js","sourceRoot":"","sources":["../src/NamirasoftAlarmServerAlarm.ts"],"names":[],"mappings":";;;;;;;;;;;;AAsBA,qDAA6C;AAC7C,2EAAwE;AAGxE,MAAa,0BAA2B,SAAQ,qDAAyB;IAErE,YAAY,QAAgB,EAAE,OAAqB,EAAE,OAA+B;QAEhF,KAAK,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAClC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjC,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzC,CAAC;IACK,IAAI,CAAC,OAA4B,EAAE,IAAqB,EAAE,IAAqB;;
|
|
1
|
+
{"version":3,"file":"NamirasoftAlarmServerAlarm.js","sourceRoot":"","sources":["../src/NamirasoftAlarmServerAlarm.ts"],"names":[],"mappings":";;;;;;;;;;;;AAsBA,qDAA6C;AAC7C,2EAAwE;AAGxE,MAAa,0BAA2B,SAAQ,qDAAyB;IAErE,YAAY,QAAgB,EAAE,OAAqB,EAAE,OAA+B;QAEhF,KAAK,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAClC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjC,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzC,CAAC;IACK,IAAI,CAAC,OAA4B,EAAE,IAAqB,EAAE,IAAqB,EAAE,OAAwB;;YAE3G,IAAI,oBAAoB,GAAW,4BAAU,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;YACjE,IAAI,IAAI,GAAG,aAAa,CAAC;YACzB,IAAI,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,IAAI,CAAsC,IAAI,EAAE,EAAE,OAAO,EAAE,oBAAoB,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;YAClI,OAAO,IAAI,CAAC;QAChB,CAAC;KAAA;IACK,GAAG,CAAC,EAAU;;YAEhB,IAAI,IAAI,GAAG,UAAU,EAAE,EAAE,CAAC;YAC1B,IAAI,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,IAAI,CAAW,IAAI,EAAE,EAAE,CAAC,CAAC;YACnD,OAAO,IAAI,CAAC;QAChB,CAAC;KAAA;IACK,MAAM,CAAC,IAAmB;;YAE5B,IAAI,IAAI,GAAG,QAAQ,CAAC;YACpB,IAAI,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAW,IAAI,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;YAC1D,OAAO,IAAI,CAAC;QAChB,CAAC;KAAA;IACK,MAAM,CAAC,EAAU,EAAE,IAAmB;;YAExC,IAAI,IAAI,GAAG,UAAU,EAAE,EAAE,CAAC;YAC1B,IAAI,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,IAAI,CAAW,IAAI,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;YACzD,OAAO,IAAI,CAAC;QAChB,CAAC;KAAA;IACK,MAAM,CAAC,EAAU;;YAEnB,IAAI,IAAI,GAAG,UAAU,EAAE,EAAE,CAAC;YAC1B,MAAM,IAAI,CAAC,OAAO,CAAO,IAAI,EAAE,EAAE,CAAC,CAAC;QACvC,CAAC;KAAA;CACJ;AAzCD,gEAyCC;AAAA,CAAC"}
|
|
@@ -4,7 +4,7 @@ exports.NamirasoftAlarmServerBase = void 0;
|
|
|
4
4
|
const namirasoft_account_1 = require("namirasoft-account");
|
|
5
5
|
class NamirasoftAlarmServerBase extends namirasoft_account_1.NamirasoftServerBase {
|
|
6
6
|
constructor(base_url, manager, onError) {
|
|
7
|
-
super(base_url, `1.4.
|
|
7
|
+
super(base_url, `1.4.2`, manager, onError);
|
|
8
8
|
}
|
|
9
9
|
}
|
|
10
10
|
exports.NamirasoftAlarmServerBase = NamirasoftAlarmServerBase;
|
|
@@ -16,7 +16,7 @@ const NamirasoftAlarmServer_1 = require("../NamirasoftAlarmServer");
|
|
|
16
16
|
const namirasoft_account_1 = require("namirasoft-account");
|
|
17
17
|
class AlarmListCommand extends namirasoft_node_cli_1.BaseFinalCommand {
|
|
18
18
|
constructor(argv) {
|
|
19
|
-
super(argv, ["filters", "page", "size"], []);
|
|
19
|
+
super(argv, ["filters", "page", "size", "user_id"], []);
|
|
20
20
|
}
|
|
21
21
|
exec() {
|
|
22
22
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -28,7 +28,7 @@ class AlarmListCommand extends namirasoft_node_cli_1.BaseFinalCommand {
|
|
|
28
28
|
manager.setValue(token, false);
|
|
29
29
|
let url = this.app.storage.getItem("ns-alarm-server-url");
|
|
30
30
|
let server = new NamirasoftAlarmServer_1.NamirasoftAlarmServer(url, manager, e => this.app.logger.error(e.message));
|
|
31
|
-
let ans = yield server.alarm.List(this.arg_values[0], this.arg_values[1], this.arg_values[2]);
|
|
31
|
+
let ans = yield server.alarm.List(this.arg_values[0], this.arg_values[1], this.arg_values[2], this.arg_values[3]);
|
|
32
32
|
this.app.logger.success(JSON.stringify(ans));
|
|
33
33
|
});
|
|
34
34
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AlarmListCommand.js","sourceRoot":"","sources":["../../src/command/AlarmListCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;AAoBA,6DAAuD;AACvD,qDAAiD;AACjD,oEAAiE;AACjE,2DAAkD;AAElD,MAAa,gBAAiB,SAAQ,sCAAgB;IAElD,YAAY,IAAc;QAEtB,KAAK,CAAC,IAAI,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"AlarmListCommand.js","sourceRoot":"","sources":["../../src/command/AlarmListCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;AAoBA,6DAAuD;AACvD,qDAAiD;AACjD,oEAAiE;AACjE,2DAAkD;AAElD,MAAa,gBAAiB,SAAQ,sCAAgB;IAElD,YAAY,IAAc;QAEtB,KAAK,CAAC,IAAI,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;IAC5D,CAAC;IACc,IAAI;;YAEf,IAAI,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;YAC3C,IAAI,KAAK,IAAI,IAAI;gBACb,MAAM,IAAI,KAAK,CAAC,iHAAiH,CAAC,CAAC;YACvI,IAAI,OAAO,GAAG,IAAI,gCAAc,EAAE,CAAC;YACnC,IAAI,OAAO,GAAG,IAAI,iCAAY,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;YACnD,OAAO,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YAC/B,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;YAC1D,IAAI,MAAM,GAAG,IAAI,6CAAqB,CAAC,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YAC5F,IAAI,GAAG,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;YAClH,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;QACjD,CAAC;KAAA;CACJ;AAnBD,4CAmBC;AAAA,CAAC"}
|
package/package.json
CHANGED
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
"framework": "npm",
|
|
9
9
|
"application": "package",
|
|
10
10
|
"private": false,
|
|
11
|
-
"version": "1.4.
|
|
11
|
+
"version": "1.4.2",
|
|
12
12
|
"author": "Amir Abolhasani",
|
|
13
13
|
"license": "MIT",
|
|
14
14
|
"main": "./dist/index.js",
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
"namirasoft-core": "^1.4.12",
|
|
21
21
|
"namirasoft-site": "^1.4.0",
|
|
22
22
|
"namirasoft-node-cli": "^1.4.4",
|
|
23
|
-
"namirasoft-account": "^1.4.
|
|
23
|
+
"namirasoft-account": "^1.4.20"
|
|
24
24
|
},
|
|
25
25
|
"bin": {
|
|
26
26
|
"ns-alarm": "./dist/command/cli.js"
|
|
@@ -35,11 +35,11 @@ export class NamirasoftAlarmServerAlarm extends NamirasoftAlarmServerBase
|
|
|
35
35
|
this.Update = this.Update.bind(this);
|
|
36
36
|
this.Delete = this.Delete.bind(this);
|
|
37
37
|
}
|
|
38
|
-
async List(filters: FilterItem[] | null, page: (number | null), size: (number | null)): Promise<{ rows: AlarmRow[], count: number }>
|
|
38
|
+
async List(filters: FilterItem[] | null, page: (number | null), size: (number | null), user_id: (string | null)): Promise<{ rows: AlarmRow[], count: number }>
|
|
39
39
|
{
|
|
40
40
|
let filters_string_value: string = FilterItem.stringify(filters);
|
|
41
41
|
let path = `/alarm/list`;
|
|
42
|
-
let { data } = await this._get<{ rows: AlarmRow[], count: number }>(path, { filters: filters_string_value, page, size });
|
|
42
|
+
let { data } = await this._get<{ rows: AlarmRow[], count: number }>(path, { filters: filters_string_value, page, size, user_id });
|
|
43
43
|
return data;
|
|
44
44
|
}
|
|
45
45
|
async Get(id: string): Promise<AlarmRow>
|
|
@@ -25,6 +25,6 @@ export class NamirasoftAlarmServerBase extends NamirasoftServerBase
|
|
|
25
25
|
{
|
|
26
26
|
constructor(base_url: string, manager: TokenManager, onError: (error: Error) => void)
|
|
27
27
|
{
|
|
28
|
-
super(base_url, `1.4.
|
|
28
|
+
super(base_url, `1.4.2`, manager, onError);
|
|
29
29
|
}
|
|
30
30
|
};
|
|
@@ -27,7 +27,7 @@ export class AlarmListCommand extends BaseFinalCommand
|
|
|
27
27
|
{
|
|
28
28
|
constructor(argv: string[])
|
|
29
29
|
{
|
|
30
|
-
super(argv, ["filters", "page", "size"], []);
|
|
30
|
+
super(argv, ["filters", "page", "size", "user_id"], []);
|
|
31
31
|
}
|
|
32
32
|
override async exec()
|
|
33
33
|
{
|
|
@@ -39,7 +39,7 @@ export class AlarmListCommand extends BaseFinalCommand
|
|
|
39
39
|
manager.setValue(token, false);
|
|
40
40
|
let url = this.app.storage.getItem("ns-alarm-server-url");
|
|
41
41
|
let server = new NamirasoftAlarmServer(url, manager, e => this.app.logger.error(e.message));
|
|
42
|
-
let ans = await server.alarm.List(this.arg_values[0], this.arg_values[1], this.arg_values[2]);
|
|
42
|
+
let ans = await server.alarm.List(this.arg_values[0], this.arg_values[1], this.arg_values[2], this.arg_values[3]);
|
|
43
43
|
this.app.logger.success(JSON.stringify(ans));
|
|
44
44
|
}
|
|
45
45
|
};
|