gs2 1.3.166 → 1.3.168
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/formation/model/Form.d.ts +2 -2
- package/formation/model/Form.js +11 -11
- package/formation/model/Form.js.map +1 -1
- package/formation/model/Form.ts +11 -11
- package/formation/model/FormModel.d.ts +2 -1
- package/formation/model/FormModel.js +22 -2
- package/formation/model/FormModel.js.map +1 -1
- package/formation/model/FormModel.ts +24 -1
- package/formation/model/Mold.d.ts +2 -2
- package/formation/model/Mold.js +10 -10
- package/formation/model/Mold.js.map +1 -1
- package/formation/model/Mold.ts +10 -10
- package/formation/model/MoldModel.d.ts +2 -2
- package/formation/model/MoldModel.js +9 -9
- package/formation/model/MoldModel.js.map +1 -1
- package/formation/model/MoldModel.ts +9 -9
- package/formation/model/MoldModelMaster.d.ts +2 -2
- package/formation/model/MoldModelMaster.js +9 -9
- package/formation/model/MoldModelMaster.js.map +1 -1
- package/formation/model/MoldModelMaster.ts +9 -9
- package/formation/model/PropertyForm.d.ts +2 -2
- package/formation/model/PropertyForm.js +11 -11
- package/formation/model/PropertyForm.js.map +1 -1
- package/formation/model/PropertyForm.ts +11 -11
- package/formation/model/PropertyFormModel.d.ts +32 -0
- package/formation/model/PropertyFormModel.js +165 -0
- package/formation/model/PropertyFormModel.js.map +1 -0
- package/formation/model/PropertyFormModel.ts +179 -0
- package/formation/model/PropertyFormModelMaster.d.ts +48 -0
- package/formation/model/PropertyFormModelMaster.js +221 -0
- package/formation/model/PropertyFormModelMaster.js.map +1 -0
- package/formation/model/PropertyFormModelMaster.ts +235 -0
- package/formation/model/index.d.ts +3 -1
- package/formation/model/index.js +5 -1
- package/formation/model/index.js.map +1 -1
- package/formation/model/index.ts +4 -0
- package/formation/request/AcquireActionsToFormPropertiesRequest.d.ts +4 -4
- package/formation/request/AcquireActionsToFormPropertiesRequest.js +9 -9
- package/formation/request/AcquireActionsToFormPropertiesRequest.js.map +1 -1
- package/formation/request/AcquireActionsToFormPropertiesRequest.ts +9 -9
- package/formation/request/AcquireActionsToPropertyFormPropertiesRequest.d.ts +4 -4
- package/formation/request/AcquireActionsToPropertyFormPropertiesRequest.js +9 -9
- package/formation/request/AcquireActionsToPropertyFormPropertiesRequest.js.map +1 -1
- package/formation/request/AcquireActionsToPropertyFormPropertiesRequest.ts +9 -9
- package/formation/request/AddMoldCapacityByUserIdRequest.d.ts +4 -4
- package/formation/request/AddMoldCapacityByUserIdRequest.js +9 -9
- package/formation/request/AddMoldCapacityByUserIdRequest.js.map +1 -1
- package/formation/request/AddMoldCapacityByUserIdRequest.ts +9 -9
- package/formation/request/CreatePropertyFormModelMasterRequest.d.ts +38 -0
- package/formation/request/CreatePropertyFormModelMasterRequest.js +133 -0
- package/formation/request/CreatePropertyFormModelMasterRequest.js.map +1 -0
- package/formation/request/CreatePropertyFormModelMasterRequest.ts +140 -0
- package/formation/request/DeleteFormByUserIdRequest.d.ts +4 -4
- package/formation/request/DeleteFormByUserIdRequest.js +9 -9
- package/formation/request/DeleteFormByUserIdRequest.js.map +1 -1
- package/formation/request/DeleteFormByUserIdRequest.ts +9 -9
- package/formation/request/DeleteFormRequest.d.ts +4 -4
- package/formation/request/DeleteFormRequest.js +9 -9
- package/formation/request/DeleteFormRequest.js.map +1 -1
- package/formation/request/DeleteFormRequest.ts +9 -9
- package/formation/request/DeleteMoldByUserIdRequest.d.ts +4 -4
- package/formation/request/DeleteMoldByUserIdRequest.js +9 -9
- package/formation/request/DeleteMoldByUserIdRequest.js.map +1 -1
- package/formation/request/DeleteMoldByUserIdRequest.ts +9 -9
- package/formation/request/DeleteMoldModelMasterRequest.d.ts +4 -4
- package/formation/request/DeleteMoldModelMasterRequest.js +9 -9
- package/formation/request/DeleteMoldModelMasterRequest.js.map +1 -1
- package/formation/request/DeleteMoldModelMasterRequest.ts +9 -9
- package/formation/request/DeleteMoldRequest.d.ts +4 -4
- package/formation/request/DeleteMoldRequest.js +9 -9
- package/formation/request/DeleteMoldRequest.js.map +1 -1
- package/formation/request/DeleteMoldRequest.ts +9 -9
- package/formation/request/DeletePropertyFormByUserIdRequest.d.ts +4 -4
- package/formation/request/DeletePropertyFormByUserIdRequest.js +9 -9
- package/formation/request/DeletePropertyFormByUserIdRequest.js.map +1 -1
- package/formation/request/DeletePropertyFormByUserIdRequest.ts +9 -9
- package/formation/request/DeletePropertyFormModelMasterRequest.d.ts +25 -0
- package/formation/request/DeletePropertyFormModelMasterRequest.js +83 -0
- package/formation/request/DeletePropertyFormModelMasterRequest.js.map +1 -0
- package/formation/request/DeletePropertyFormModelMasterRequest.ts +90 -0
- package/formation/request/DeletePropertyFormRequest.d.ts +4 -4
- package/formation/request/DeletePropertyFormRequest.js +9 -9
- package/formation/request/DeletePropertyFormRequest.js.map +1 -1
- package/formation/request/DeletePropertyFormRequest.ts +9 -9
- package/formation/request/DescribeFormsByUserIdRequest.d.ts +4 -4
- package/formation/request/DescribeFormsByUserIdRequest.js +9 -9
- package/formation/request/DescribeFormsByUserIdRequest.js.map +1 -1
- package/formation/request/DescribeFormsByUserIdRequest.ts +9 -9
- package/formation/request/DescribeFormsRequest.d.ts +4 -4
- package/formation/request/DescribeFormsRequest.js +9 -9
- package/formation/request/DescribeFormsRequest.js.map +1 -1
- package/formation/request/DescribeFormsRequest.ts +9 -9
- package/formation/request/DescribePropertyFormModelMastersRequest.d.ts +29 -0
- package/formation/request/DescribePropertyFormModelMastersRequest.js +97 -0
- package/formation/request/DescribePropertyFormModelMastersRequest.js.map +1 -0
- package/formation/request/DescribePropertyFormModelMastersRequest.ts +104 -0
- package/formation/request/DescribePropertyFormModelsRequest.d.ts +21 -0
- package/formation/request/DescribePropertyFormModelsRequest.js +69 -0
- package/formation/request/DescribePropertyFormModelsRequest.js.map +1 -0
- package/formation/request/DescribePropertyFormModelsRequest.ts +76 -0
- package/formation/request/DescribePropertyFormsByUserIdRequest.d.ts +4 -4
- package/formation/request/DescribePropertyFormsByUserIdRequest.js +9 -9
- package/formation/request/DescribePropertyFormsByUserIdRequest.js.map +1 -1
- package/formation/request/DescribePropertyFormsByUserIdRequest.ts +9 -9
- package/formation/request/DescribePropertyFormsRequest.d.ts +4 -4
- package/formation/request/DescribePropertyFormsRequest.js +9 -9
- package/formation/request/DescribePropertyFormsRequest.js.map +1 -1
- package/formation/request/DescribePropertyFormsRequest.ts +9 -9
- package/formation/request/GetFormByUserIdRequest.d.ts +4 -4
- package/formation/request/GetFormByUserIdRequest.js +9 -9
- package/formation/request/GetFormByUserIdRequest.js.map +1 -1
- package/formation/request/GetFormByUserIdRequest.ts +9 -9
- package/formation/request/GetFormModelRequest.d.ts +4 -0
- package/formation/request/GetFormModelRequest.js +14 -0
- package/formation/request/GetFormModelRequest.js.map +1 -1
- package/formation/request/GetFormModelRequest.ts +14 -0
- package/formation/request/GetFormRequest.d.ts +4 -4
- package/formation/request/GetFormRequest.js +9 -9
- package/formation/request/GetFormRequest.js.map +1 -1
- package/formation/request/GetFormRequest.ts +9 -9
- package/formation/request/GetFormWithSignatureByUserIdRequest.d.ts +4 -4
- package/formation/request/GetFormWithSignatureByUserIdRequest.js +9 -9
- package/formation/request/GetFormWithSignatureByUserIdRequest.js.map +1 -1
- package/formation/request/GetFormWithSignatureByUserIdRequest.ts +9 -9
- package/formation/request/GetFormWithSignatureRequest.d.ts +4 -4
- package/formation/request/GetFormWithSignatureRequest.js +9 -9
- package/formation/request/GetFormWithSignatureRequest.js.map +1 -1
- package/formation/request/GetFormWithSignatureRequest.ts +9 -9
- package/formation/request/GetMoldByUserIdRequest.d.ts +4 -4
- package/formation/request/GetMoldByUserIdRequest.js +9 -9
- package/formation/request/GetMoldByUserIdRequest.js.map +1 -1
- package/formation/request/GetMoldByUserIdRequest.ts +9 -9
- package/formation/request/GetMoldModelMasterRequest.d.ts +4 -4
- package/formation/request/GetMoldModelMasterRequest.js +9 -9
- package/formation/request/GetMoldModelMasterRequest.js.map +1 -1
- package/formation/request/GetMoldModelMasterRequest.ts +9 -9
- package/formation/request/GetMoldModelRequest.d.ts +4 -4
- package/formation/request/GetMoldModelRequest.js +9 -9
- package/formation/request/GetMoldModelRequest.js.map +1 -1
- package/formation/request/GetMoldModelRequest.ts +9 -9
- package/formation/request/GetMoldRequest.d.ts +4 -4
- package/formation/request/GetMoldRequest.js +9 -9
- package/formation/request/GetMoldRequest.js.map +1 -1
- package/formation/request/GetMoldRequest.ts +9 -9
- package/formation/request/GetPropertyFormByUserIdRequest.d.ts +4 -4
- package/formation/request/GetPropertyFormByUserIdRequest.js +9 -9
- package/formation/request/GetPropertyFormByUserIdRequest.js.map +1 -1
- package/formation/request/GetPropertyFormByUserIdRequest.ts +9 -9
- package/formation/request/GetPropertyFormModelMasterRequest.d.ts +25 -0
- package/formation/request/GetPropertyFormModelMasterRequest.js +83 -0
- package/formation/request/GetPropertyFormModelMasterRequest.js.map +1 -0
- package/formation/request/GetPropertyFormModelMasterRequest.ts +90 -0
- package/formation/request/GetPropertyFormModelRequest.d.ts +25 -0
- package/formation/request/GetPropertyFormModelRequest.js +83 -0
- package/formation/request/GetPropertyFormModelRequest.js.map +1 -0
- package/formation/request/GetPropertyFormModelRequest.ts +90 -0
- package/formation/request/GetPropertyFormRequest.d.ts +4 -4
- package/formation/request/GetPropertyFormRequest.js +9 -9
- package/formation/request/GetPropertyFormRequest.js.map +1 -1
- package/formation/request/GetPropertyFormRequest.ts +9 -9
- package/formation/request/GetPropertyFormWithSignatureByUserIdRequest.d.ts +4 -4
- package/formation/request/GetPropertyFormWithSignatureByUserIdRequest.js +9 -9
- package/formation/request/GetPropertyFormWithSignatureByUserIdRequest.js.map +1 -1
- package/formation/request/GetPropertyFormWithSignatureByUserIdRequest.ts +9 -9
- package/formation/request/GetPropertyFormWithSignatureRequest.d.ts +4 -4
- package/formation/request/GetPropertyFormWithSignatureRequest.js +9 -9
- package/formation/request/GetPropertyFormWithSignatureRequest.js.map +1 -1
- package/formation/request/GetPropertyFormWithSignatureRequest.ts +9 -9
- package/formation/request/SetFormByUserIdRequest.d.ts +4 -4
- package/formation/request/SetFormByUserIdRequest.js +9 -9
- package/formation/request/SetFormByUserIdRequest.js.map +1 -1
- package/formation/request/SetFormByUserIdRequest.ts +9 -9
- package/formation/request/SetFormWithSignatureRequest.d.ts +4 -4
- package/formation/request/SetFormWithSignatureRequest.js +9 -9
- package/formation/request/SetFormWithSignatureRequest.js.map +1 -1
- package/formation/request/SetFormWithSignatureRequest.ts +9 -9
- package/formation/request/SetMoldCapacityByUserIdRequest.d.ts +4 -4
- package/formation/request/SetMoldCapacityByUserIdRequest.js +9 -9
- package/formation/request/SetMoldCapacityByUserIdRequest.js.map +1 -1
- package/formation/request/SetMoldCapacityByUserIdRequest.ts +9 -9
- package/formation/request/SetPropertyFormByUserIdRequest.d.ts +4 -4
- package/formation/request/SetPropertyFormByUserIdRequest.js +9 -9
- package/formation/request/SetPropertyFormByUserIdRequest.js.map +1 -1
- package/formation/request/SetPropertyFormByUserIdRequest.ts +9 -9
- package/formation/request/SetPropertyFormWithSignatureRequest.d.ts +4 -4
- package/formation/request/SetPropertyFormWithSignatureRequest.js +9 -9
- package/formation/request/SetPropertyFormWithSignatureRequest.js.map +1 -1
- package/formation/request/SetPropertyFormWithSignatureRequest.ts +9 -9
- package/formation/request/SubMoldCapacityByUserIdRequest.d.ts +4 -4
- package/formation/request/SubMoldCapacityByUserIdRequest.js +9 -9
- package/formation/request/SubMoldCapacityByUserIdRequest.js.map +1 -1
- package/formation/request/SubMoldCapacityByUserIdRequest.ts +9 -9
- package/formation/request/UpdateMoldModelMasterRequest.d.ts +4 -4
- package/formation/request/UpdateMoldModelMasterRequest.js +9 -9
- package/formation/request/UpdateMoldModelMasterRequest.js.map +1 -1
- package/formation/request/UpdateMoldModelMasterRequest.ts +9 -9
- package/formation/request/UpdatePropertyFormModelMasterRequest.d.ts +38 -0
- package/formation/request/UpdatePropertyFormModelMasterRequest.js +133 -0
- package/formation/request/UpdatePropertyFormModelMasterRequest.js.map +1 -0
- package/formation/request/UpdatePropertyFormModelMasterRequest.ts +140 -0
- package/formation/request/index.d.ts +8 -2
- package/formation/request/index.js +16 -4
- package/formation/request/index.js.map +1 -1
- package/formation/request/index.ts +14 -2
- package/formation/rest.d.ts +7 -1
- package/formation/rest.js +246 -92
- package/formation/rest.js.map +1 -1
- package/formation/rest.ts +271 -93
- package/formation/result/CreatePropertyFormModelMasterResult.d.ts +14 -0
- package/formation/result/CreatePropertyFormModelMasterResult.js +48 -0
- package/formation/result/CreatePropertyFormModelMasterResult.js.map +1 -0
- package/formation/result/CreatePropertyFormModelMasterResult.ts +48 -0
- package/formation/result/DeletePropertyFormByUserIdResult.d.ts +4 -4
- package/formation/result/DeletePropertyFormByUserIdResult.js +9 -9
- package/formation/result/DeletePropertyFormByUserIdResult.js.map +1 -1
- package/formation/result/DeletePropertyFormByUserIdResult.ts +9 -9
- package/formation/result/DeletePropertyFormModelMasterResult.d.ts +14 -0
- package/formation/result/DeletePropertyFormModelMasterResult.js +48 -0
- package/formation/result/DeletePropertyFormModelMasterResult.js.map +1 -0
- package/formation/result/DeletePropertyFormModelMasterResult.ts +48 -0
- package/formation/result/DeletePropertyFormResult.d.ts +4 -4
- package/formation/result/DeletePropertyFormResult.js +9 -9
- package/formation/result/DeletePropertyFormResult.js.map +1 -1
- package/formation/result/DeletePropertyFormResult.ts +9 -9
- package/formation/result/DescribePropertyFormModelMastersResult.d.ts +18 -0
- package/formation/result/DescribePropertyFormModelMastersResult.js +67 -0
- package/formation/result/DescribePropertyFormModelMastersResult.js.map +1 -0
- package/formation/result/DescribePropertyFormModelMastersResult.ts +73 -0
- package/formation/result/DescribePropertyFormModelsResult.d.ts +14 -0
- package/formation/result/DescribePropertyFormModelsResult.js +53 -0
- package/formation/result/DescribePropertyFormModelsResult.js.map +1 -0
- package/formation/result/DescribePropertyFormModelsResult.ts +56 -0
- package/formation/result/GetPropertyFormByUserIdResult.d.ts +4 -4
- package/formation/result/GetPropertyFormByUserIdResult.js +9 -9
- package/formation/result/GetPropertyFormByUserIdResult.js.map +1 -1
- package/formation/result/GetPropertyFormByUserIdResult.ts +9 -9
- package/formation/result/GetPropertyFormModelMasterResult.d.ts +14 -0
- package/formation/result/GetPropertyFormModelMasterResult.js +48 -0
- package/formation/result/GetPropertyFormModelMasterResult.js.map +1 -0
- package/formation/result/GetPropertyFormModelMasterResult.ts +48 -0
- package/formation/result/GetPropertyFormModelResult.d.ts +14 -0
- package/formation/result/GetPropertyFormModelResult.js +48 -0
- package/formation/result/GetPropertyFormModelResult.js.map +1 -0
- package/formation/result/GetPropertyFormModelResult.ts +48 -0
- package/formation/result/GetPropertyFormResult.d.ts +4 -4
- package/formation/result/GetPropertyFormResult.js +9 -9
- package/formation/result/GetPropertyFormResult.js.map +1 -1
- package/formation/result/GetPropertyFormResult.ts +9 -9
- package/formation/result/GetPropertyFormWithSignatureByUserIdResult.d.ts +4 -4
- package/formation/result/GetPropertyFormWithSignatureByUserIdResult.js +9 -9
- package/formation/result/GetPropertyFormWithSignatureByUserIdResult.js.map +1 -1
- package/formation/result/GetPropertyFormWithSignatureByUserIdResult.ts +9 -9
- package/formation/result/GetPropertyFormWithSignatureResult.d.ts +4 -4
- package/formation/result/GetPropertyFormWithSignatureResult.js +9 -9
- package/formation/result/GetPropertyFormWithSignatureResult.js.map +1 -1
- package/formation/result/GetPropertyFormWithSignatureResult.ts +9 -9
- package/formation/result/SetPropertyFormByUserIdResult.d.ts +4 -4
- package/formation/result/SetPropertyFormByUserIdResult.js +9 -9
- package/formation/result/SetPropertyFormByUserIdResult.js.map +1 -1
- package/formation/result/SetPropertyFormByUserIdResult.ts +9 -9
- package/formation/result/SetPropertyFormWithSignatureResult.d.ts +4 -4
- package/formation/result/SetPropertyFormWithSignatureResult.js +9 -9
- package/formation/result/SetPropertyFormWithSignatureResult.js.map +1 -1
- package/formation/result/SetPropertyFormWithSignatureResult.ts +9 -9
- package/formation/result/UpdatePropertyFormModelMasterResult.d.ts +14 -0
- package/formation/result/UpdatePropertyFormModelMasterResult.js +48 -0
- package/formation/result/UpdatePropertyFormModelMasterResult.js.map +1 -0
- package/formation/result/UpdatePropertyFormModelMasterResult.ts +48 -0
- package/formation/result/index.d.ts +8 -2
- package/formation/result/index.js +16 -4
- package/formation/result/index.js.map +1 -1
- package/formation/result/index.ts +14 -2
- package/inventory/model/BigInventory.d.ts +5 -0
- package/inventory/model/BigInventory.js +22 -0
- package/inventory/model/BigInventory.js.map +1 -1
- package/inventory/model/BigInventory.ts +23 -0
- package/package.json +1 -1
|
@@ -10,9 +10,9 @@ export default class MoldModel implements IModel {
|
|
|
10
10
|
static getRegion(grn: string): string | null;
|
|
11
11
|
static getOwnerId(grn: string): string | null;
|
|
12
12
|
static getNamespaceName(grn: string): string | null;
|
|
13
|
-
static
|
|
13
|
+
static getMoldModelName(grn: string): string | null;
|
|
14
14
|
static isValid(grn: string): boolean;
|
|
15
|
-
static createGrn(region: string | null, ownerId: string | null, namespaceName: string | null,
|
|
15
|
+
static createGrn(region: string | null, ownerId: string | null, namespaceName: string | null, moldModelName: string | null): string | null;
|
|
16
16
|
getMoldModelId(): string | null;
|
|
17
17
|
setMoldModelId(moldModelId: string | null): this;
|
|
18
18
|
withMoldModelId(moldModelId: string | null): this;
|
|
@@ -17,7 +17,7 @@ permissions and limitations under the License.
|
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
18
|
var tslib_1 = require("tslib");
|
|
19
19
|
var FormModel_1 = tslib_1.__importDefault(require("./FormModel"));
|
|
20
|
-
var grnFormat = "grn:gs2:{region}:{ownerId}:formation:{namespaceName}:model:mold:{
|
|
20
|
+
var grnFormat = "grn:gs2:{region}:{ownerId}:formation:{namespaceName}:model:mold:{moldModelName}";
|
|
21
21
|
var MoldModel = /** @class */ (function () {
|
|
22
22
|
function MoldModel() {
|
|
23
23
|
this.moldModelId = null;
|
|
@@ -32,7 +32,7 @@ var MoldModel = /** @class */ (function () {
|
|
|
32
32
|
.replace('{region}', '(.*)')
|
|
33
33
|
.replace('{ownerId}', '.*')
|
|
34
34
|
.replace('{namespaceName}', '.*')
|
|
35
|
-
.replace('{
|
|
35
|
+
.replace('{moldModelName}', '.*'));
|
|
36
36
|
if (match) {
|
|
37
37
|
return match[1];
|
|
38
38
|
}
|
|
@@ -43,7 +43,7 @@ var MoldModel = /** @class */ (function () {
|
|
|
43
43
|
.replace('{region}', '.*')
|
|
44
44
|
.replace('{ownerId}', '(.*)')
|
|
45
45
|
.replace('{namespaceName}', '.*')
|
|
46
|
-
.replace('{
|
|
46
|
+
.replace('{moldModelName}', '.*'));
|
|
47
47
|
if (match) {
|
|
48
48
|
return match[1];
|
|
49
49
|
}
|
|
@@ -54,18 +54,18 @@ var MoldModel = /** @class */ (function () {
|
|
|
54
54
|
.replace('{region}', '.*')
|
|
55
55
|
.replace('{ownerId}', '.*')
|
|
56
56
|
.replace('{namespaceName}', '(.*)')
|
|
57
|
-
.replace('{
|
|
57
|
+
.replace('{moldModelName}', '.*'));
|
|
58
58
|
if (match) {
|
|
59
59
|
return match[1];
|
|
60
60
|
}
|
|
61
61
|
return null;
|
|
62
62
|
};
|
|
63
|
-
MoldModel.
|
|
63
|
+
MoldModel.getMoldModelName = function (grn) {
|
|
64
64
|
var match = grn.match(grnFormat
|
|
65
65
|
.replace('{region}', '.*')
|
|
66
66
|
.replace('{ownerId}', '.*')
|
|
67
67
|
.replace('{namespaceName}', '.*')
|
|
68
|
-
.replace('{
|
|
68
|
+
.replace('{moldModelName}', '(.*)'));
|
|
69
69
|
if (match) {
|
|
70
70
|
return match[1];
|
|
71
71
|
}
|
|
@@ -81,17 +81,17 @@ var MoldModel = /** @class */ (function () {
|
|
|
81
81
|
if (this.getNamespaceName(grn) == null || this.getNamespaceName(grn) === '') {
|
|
82
82
|
return false;
|
|
83
83
|
}
|
|
84
|
-
if (this.
|
|
84
|
+
if (this.getMoldModelName(grn) == null || this.getMoldModelName(grn) === '') {
|
|
85
85
|
return false;
|
|
86
86
|
}
|
|
87
87
|
return true;
|
|
88
88
|
};
|
|
89
|
-
MoldModel.createGrn = function (region, ownerId, namespaceName,
|
|
89
|
+
MoldModel.createGrn = function (region, ownerId, namespaceName, moldModelName) {
|
|
90
90
|
return grnFormat
|
|
91
91
|
.replace('{region}', region !== null && region !== void 0 ? region : '')
|
|
92
92
|
.replace('{ownerId}', ownerId !== null && ownerId !== void 0 ? ownerId : '')
|
|
93
93
|
.replace('{namespaceName}', namespaceName !== null && namespaceName !== void 0 ? namespaceName : '')
|
|
94
|
-
.replace('{
|
|
94
|
+
.replace('{moldModelName}', moldModelName !== null && moldModelName !== void 0 ? moldModelName : '');
|
|
95
95
|
};
|
|
96
96
|
MoldModel.prototype.getMoldModelId = function () {
|
|
97
97
|
return this.moldModelId;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MoldModel.js","sourceRoot":"","sources":["MoldModel.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAIH,kEAAoC;AACpC,IAAM,SAAS,GAAW,
|
|
1
|
+
{"version":3,"file":"MoldModel.js","sourceRoot":"","sources":["MoldModel.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,7 +17,7 @@ permissions and limitations under the License.
|
|
|
17
17
|
import IModel from '../../core/interface/IModel';
|
|
18
18
|
import SlotModel from './SlotModel';
|
|
19
19
|
import FormModel from './FormModel';
|
|
20
|
-
const grnFormat: string = "grn:gs2:{region}:{ownerId}:formation:{namespaceName}:model:mold:{
|
|
20
|
+
const grnFormat: string = "grn:gs2:{region}:{ownerId}:formation:{namespaceName}:model:mold:{moldModelName}";
|
|
21
21
|
|
|
22
22
|
export default class MoldModel implements IModel {
|
|
23
23
|
private moldModelId: string|null = null;
|
|
@@ -32,7 +32,7 @@ export default class MoldModel implements IModel {
|
|
|
32
32
|
.replace('{region}', '(.*)')
|
|
33
33
|
.replace('{ownerId}', '.*')
|
|
34
34
|
.replace('{namespaceName}', '.*')
|
|
35
|
-
.replace('{
|
|
35
|
+
.replace('{moldModelName}', '.*')
|
|
36
36
|
);
|
|
37
37
|
if (match) {
|
|
38
38
|
return match[1];
|
|
@@ -45,7 +45,7 @@ export default class MoldModel implements IModel {
|
|
|
45
45
|
.replace('{region}', '.*')
|
|
46
46
|
.replace('{ownerId}', '(.*)')
|
|
47
47
|
.replace('{namespaceName}', '.*')
|
|
48
|
-
.replace('{
|
|
48
|
+
.replace('{moldModelName}', '.*')
|
|
49
49
|
);
|
|
50
50
|
if (match) {
|
|
51
51
|
return match[1];
|
|
@@ -58,7 +58,7 @@ export default class MoldModel implements IModel {
|
|
|
58
58
|
.replace('{region}', '.*')
|
|
59
59
|
.replace('{ownerId}', '.*')
|
|
60
60
|
.replace('{namespaceName}', '(.*)')
|
|
61
|
-
.replace('{
|
|
61
|
+
.replace('{moldModelName}', '.*')
|
|
62
62
|
);
|
|
63
63
|
if (match) {
|
|
64
64
|
return match[1];
|
|
@@ -66,12 +66,12 @@ export default class MoldModel implements IModel {
|
|
|
66
66
|
return null;
|
|
67
67
|
}
|
|
68
68
|
|
|
69
|
-
public static
|
|
69
|
+
public static getMoldModelName(grn: string): string|null {
|
|
70
70
|
const match = grn.match(grnFormat
|
|
71
71
|
.replace('{region}', '.*')
|
|
72
72
|
.replace('{ownerId}', '.*')
|
|
73
73
|
.replace('{namespaceName}', '.*')
|
|
74
|
-
.replace('{
|
|
74
|
+
.replace('{moldModelName}', '(.*)')
|
|
75
75
|
);
|
|
76
76
|
if (match) {
|
|
77
77
|
return match[1];
|
|
@@ -89,7 +89,7 @@ export default class MoldModel implements IModel {
|
|
|
89
89
|
if (this.getNamespaceName(grn) == null || this.getNamespaceName(grn) === '') {
|
|
90
90
|
return false;
|
|
91
91
|
}
|
|
92
|
-
if (this.
|
|
92
|
+
if (this.getMoldModelName(grn) == null || this.getMoldModelName(grn) === '') {
|
|
93
93
|
return false;
|
|
94
94
|
}
|
|
95
95
|
return true;
|
|
@@ -99,13 +99,13 @@ export default class MoldModel implements IModel {
|
|
|
99
99
|
region: string|null,
|
|
100
100
|
ownerId: string|null,
|
|
101
101
|
namespaceName: string|null,
|
|
102
|
-
|
|
102
|
+
moldModelName: string|null,
|
|
103
103
|
): string|null {
|
|
104
104
|
return grnFormat
|
|
105
105
|
.replace('{region}', region ?? '')
|
|
106
106
|
.replace('{ownerId}', ownerId ?? '')
|
|
107
107
|
.replace('{namespaceName}', namespaceName ?? '')
|
|
108
|
-
.replace('{
|
|
108
|
+
.replace('{moldModelName}', moldModelName ?? '');
|
|
109
109
|
}
|
|
110
110
|
public getMoldModelId(): string|null {
|
|
111
111
|
return this.moldModelId;
|
|
@@ -13,9 +13,9 @@ export default class MoldModelMaster implements IModel {
|
|
|
13
13
|
static getRegion(grn: string): string | null;
|
|
14
14
|
static getOwnerId(grn: string): string | null;
|
|
15
15
|
static getNamespaceName(grn: string): string | null;
|
|
16
|
-
static
|
|
16
|
+
static getMoldModelName(grn: string): string | null;
|
|
17
17
|
static isValid(grn: string): boolean;
|
|
18
|
-
static createGrn(region: string | null, ownerId: string | null, namespaceName: string | null,
|
|
18
|
+
static createGrn(region: string | null, ownerId: string | null, namespaceName: string | null, moldModelName: string | null): string | null;
|
|
19
19
|
getMoldModelId(): string | null;
|
|
20
20
|
setMoldModelId(moldModelId: string | null): this;
|
|
21
21
|
withMoldModelId(moldModelId: string | null): this;
|
|
@@ -15,7 +15,7 @@ express or implied. See the License for the specific language governing
|
|
|
15
15
|
permissions and limitations under the License.
|
|
16
16
|
*/
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
-
var grnFormat = "grn:gs2:{region}:{ownerId}:formation:{namespaceName}:model:mold:{
|
|
18
|
+
var grnFormat = "grn:gs2:{region}:{ownerId}:formation:{namespaceName}:model:mold:{moldModelName}";
|
|
19
19
|
var MoldModelMaster = /** @class */ (function () {
|
|
20
20
|
function MoldModelMaster() {
|
|
21
21
|
this.moldModelId = null;
|
|
@@ -34,7 +34,7 @@ var MoldModelMaster = /** @class */ (function () {
|
|
|
34
34
|
.replace('{region}', '(.*)')
|
|
35
35
|
.replace('{ownerId}', '.*')
|
|
36
36
|
.replace('{namespaceName}', '.*')
|
|
37
|
-
.replace('{
|
|
37
|
+
.replace('{moldModelName}', '.*'));
|
|
38
38
|
if (match) {
|
|
39
39
|
return match[1];
|
|
40
40
|
}
|
|
@@ -45,7 +45,7 @@ var MoldModelMaster = /** @class */ (function () {
|
|
|
45
45
|
.replace('{region}', '.*')
|
|
46
46
|
.replace('{ownerId}', '(.*)')
|
|
47
47
|
.replace('{namespaceName}', '.*')
|
|
48
|
-
.replace('{
|
|
48
|
+
.replace('{moldModelName}', '.*'));
|
|
49
49
|
if (match) {
|
|
50
50
|
return match[1];
|
|
51
51
|
}
|
|
@@ -56,18 +56,18 @@ var MoldModelMaster = /** @class */ (function () {
|
|
|
56
56
|
.replace('{region}', '.*')
|
|
57
57
|
.replace('{ownerId}', '.*')
|
|
58
58
|
.replace('{namespaceName}', '(.*)')
|
|
59
|
-
.replace('{
|
|
59
|
+
.replace('{moldModelName}', '.*'));
|
|
60
60
|
if (match) {
|
|
61
61
|
return match[1];
|
|
62
62
|
}
|
|
63
63
|
return null;
|
|
64
64
|
};
|
|
65
|
-
MoldModelMaster.
|
|
65
|
+
MoldModelMaster.getMoldModelName = function (grn) {
|
|
66
66
|
var match = grn.match(grnFormat
|
|
67
67
|
.replace('{region}', '.*')
|
|
68
68
|
.replace('{ownerId}', '.*')
|
|
69
69
|
.replace('{namespaceName}', '.*')
|
|
70
|
-
.replace('{
|
|
70
|
+
.replace('{moldModelName}', '(.*)'));
|
|
71
71
|
if (match) {
|
|
72
72
|
return match[1];
|
|
73
73
|
}
|
|
@@ -83,17 +83,17 @@ var MoldModelMaster = /** @class */ (function () {
|
|
|
83
83
|
if (this.getNamespaceName(grn) == null || this.getNamespaceName(grn) === '') {
|
|
84
84
|
return false;
|
|
85
85
|
}
|
|
86
|
-
if (this.
|
|
86
|
+
if (this.getMoldModelName(grn) == null || this.getMoldModelName(grn) === '') {
|
|
87
87
|
return false;
|
|
88
88
|
}
|
|
89
89
|
return true;
|
|
90
90
|
};
|
|
91
|
-
MoldModelMaster.createGrn = function (region, ownerId, namespaceName,
|
|
91
|
+
MoldModelMaster.createGrn = function (region, ownerId, namespaceName, moldModelName) {
|
|
92
92
|
return grnFormat
|
|
93
93
|
.replace('{region}', region !== null && region !== void 0 ? region : '')
|
|
94
94
|
.replace('{ownerId}', ownerId !== null && ownerId !== void 0 ? ownerId : '')
|
|
95
95
|
.replace('{namespaceName}', namespaceName !== null && namespaceName !== void 0 ? namespaceName : '')
|
|
96
|
-
.replace('{
|
|
96
|
+
.replace('{moldModelName}', moldModelName !== null && moldModelName !== void 0 ? moldModelName : '');
|
|
97
97
|
};
|
|
98
98
|
MoldModelMaster.prototype.getMoldModelId = function () {
|
|
99
99
|
return this.moldModelId;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MoldModelMaster.js","sourceRoot":"","sources":["MoldModelMaster.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;AAGH,IAAM,SAAS,GAAW,
|
|
1
|
+
{"version":3,"file":"MoldModelMaster.js","sourceRoot":"","sources":["MoldModelMaster.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@ permissions and limitations under the License.
|
|
|
15
15
|
*/
|
|
16
16
|
|
|
17
17
|
import IModel from '../../core/interface/IModel';
|
|
18
|
-
const grnFormat: string = "grn:gs2:{region}:{ownerId}:formation:{namespaceName}:model:mold:{
|
|
18
|
+
const grnFormat: string = "grn:gs2:{region}:{ownerId}:formation:{namespaceName}:model:mold:{moldModelName}";
|
|
19
19
|
|
|
20
20
|
export default class MoldModelMaster implements IModel {
|
|
21
21
|
private moldModelId: string|null = null;
|
|
@@ -34,7 +34,7 @@ export default class MoldModelMaster implements IModel {
|
|
|
34
34
|
.replace('{region}', '(.*)')
|
|
35
35
|
.replace('{ownerId}', '.*')
|
|
36
36
|
.replace('{namespaceName}', '.*')
|
|
37
|
-
.replace('{
|
|
37
|
+
.replace('{moldModelName}', '.*')
|
|
38
38
|
);
|
|
39
39
|
if (match) {
|
|
40
40
|
return match[1];
|
|
@@ -47,7 +47,7 @@ export default class MoldModelMaster implements IModel {
|
|
|
47
47
|
.replace('{region}', '.*')
|
|
48
48
|
.replace('{ownerId}', '(.*)')
|
|
49
49
|
.replace('{namespaceName}', '.*')
|
|
50
|
-
.replace('{
|
|
50
|
+
.replace('{moldModelName}', '.*')
|
|
51
51
|
);
|
|
52
52
|
if (match) {
|
|
53
53
|
return match[1];
|
|
@@ -60,7 +60,7 @@ export default class MoldModelMaster implements IModel {
|
|
|
60
60
|
.replace('{region}', '.*')
|
|
61
61
|
.replace('{ownerId}', '.*')
|
|
62
62
|
.replace('{namespaceName}', '(.*)')
|
|
63
|
-
.replace('{
|
|
63
|
+
.replace('{moldModelName}', '.*')
|
|
64
64
|
);
|
|
65
65
|
if (match) {
|
|
66
66
|
return match[1];
|
|
@@ -68,12 +68,12 @@ export default class MoldModelMaster implements IModel {
|
|
|
68
68
|
return null;
|
|
69
69
|
}
|
|
70
70
|
|
|
71
|
-
public static
|
|
71
|
+
public static getMoldModelName(grn: string): string|null {
|
|
72
72
|
const match = grn.match(grnFormat
|
|
73
73
|
.replace('{region}', '.*')
|
|
74
74
|
.replace('{ownerId}', '.*')
|
|
75
75
|
.replace('{namespaceName}', '.*')
|
|
76
|
-
.replace('{
|
|
76
|
+
.replace('{moldModelName}', '(.*)')
|
|
77
77
|
);
|
|
78
78
|
if (match) {
|
|
79
79
|
return match[1];
|
|
@@ -91,7 +91,7 @@ export default class MoldModelMaster implements IModel {
|
|
|
91
91
|
if (this.getNamespaceName(grn) == null || this.getNamespaceName(grn) === '') {
|
|
92
92
|
return false;
|
|
93
93
|
}
|
|
94
|
-
if (this.
|
|
94
|
+
if (this.getMoldModelName(grn) == null || this.getMoldModelName(grn) === '') {
|
|
95
95
|
return false;
|
|
96
96
|
}
|
|
97
97
|
return true;
|
|
@@ -101,13 +101,13 @@ export default class MoldModelMaster implements IModel {
|
|
|
101
101
|
region: string|null,
|
|
102
102
|
ownerId: string|null,
|
|
103
103
|
namespaceName: string|null,
|
|
104
|
-
|
|
104
|
+
moldModelName: string|null,
|
|
105
105
|
): string|null {
|
|
106
106
|
return grnFormat
|
|
107
107
|
.replace('{region}', region ?? '')
|
|
108
108
|
.replace('{ownerId}', ownerId ?? '')
|
|
109
109
|
.replace('{namespaceName}', namespaceName ?? '')
|
|
110
|
-
.replace('{
|
|
110
|
+
.replace('{moldModelName}', moldModelName ?? '');
|
|
111
111
|
}
|
|
112
112
|
public getMoldModelId(): string|null {
|
|
113
113
|
return this.moldModelId;
|
|
@@ -13,10 +13,10 @@ export default class PropertyForm implements IModel {
|
|
|
13
13
|
static getOwnerId(grn: string): string | null;
|
|
14
14
|
static getNamespaceName(grn: string): string | null;
|
|
15
15
|
static getUserId(grn: string): string | null;
|
|
16
|
-
static
|
|
16
|
+
static getPropertyFormModelName(grn: string): string | null;
|
|
17
17
|
static getPropertyId(grn: string): string | null;
|
|
18
18
|
static isValid(grn: string): boolean;
|
|
19
|
-
static createGrn(region: string | null, ownerId: string | null, namespaceName: string | null, userId: string | null,
|
|
19
|
+
static createGrn(region: string | null, ownerId: string | null, namespaceName: string | null, userId: string | null, propertyFormModelName: string | null, propertyId: string | null): string | null;
|
|
20
20
|
getFormId(): string | null;
|
|
21
21
|
setFormId(formId: string | null): this;
|
|
22
22
|
withFormId(formId: string | null): this;
|
|
@@ -17,7 +17,7 @@ permissions and limitations under the License.
|
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
18
|
var tslib_1 = require("tslib");
|
|
19
19
|
var Slot_1 = tslib_1.__importDefault(require("./Slot"));
|
|
20
|
-
var grnFormat = "grn:gs2:{region}:{ownerId}:formation:{namespaceName}:user:{userId}:propertyForm:{
|
|
20
|
+
var grnFormat = "grn:gs2:{region}:{ownerId}:formation:{namespaceName}:user:{userId}:propertyForm:{propertyFormModelName}:{propertyId}";
|
|
21
21
|
var PropertyForm = /** @class */ (function () {
|
|
22
22
|
function PropertyForm() {
|
|
23
23
|
this.formId = null;
|
|
@@ -35,7 +35,7 @@ var PropertyForm = /** @class */ (function () {
|
|
|
35
35
|
.replace('{ownerId}', '.*')
|
|
36
36
|
.replace('{namespaceName}', '.*')
|
|
37
37
|
.replace('{userId}', '.*')
|
|
38
|
-
.replace('{
|
|
38
|
+
.replace('{propertyFormModelName}', '.*')
|
|
39
39
|
.replace('{propertyId}', '.*'));
|
|
40
40
|
if (match) {
|
|
41
41
|
return match[1];
|
|
@@ -48,7 +48,7 @@ var PropertyForm = /** @class */ (function () {
|
|
|
48
48
|
.replace('{ownerId}', '(.*)')
|
|
49
49
|
.replace('{namespaceName}', '.*')
|
|
50
50
|
.replace('{userId}', '.*')
|
|
51
|
-
.replace('{
|
|
51
|
+
.replace('{propertyFormModelName}', '.*')
|
|
52
52
|
.replace('{propertyId}', '.*'));
|
|
53
53
|
if (match) {
|
|
54
54
|
return match[1];
|
|
@@ -61,7 +61,7 @@ var PropertyForm = /** @class */ (function () {
|
|
|
61
61
|
.replace('{ownerId}', '.*')
|
|
62
62
|
.replace('{namespaceName}', '(.*)')
|
|
63
63
|
.replace('{userId}', '.*')
|
|
64
|
-
.replace('{
|
|
64
|
+
.replace('{propertyFormModelName}', '.*')
|
|
65
65
|
.replace('{propertyId}', '.*'));
|
|
66
66
|
if (match) {
|
|
67
67
|
return match[1];
|
|
@@ -74,20 +74,20 @@ var PropertyForm = /** @class */ (function () {
|
|
|
74
74
|
.replace('{ownerId}', '.*')
|
|
75
75
|
.replace('{namespaceName}', '.*')
|
|
76
76
|
.replace('{userId}', '(.*)')
|
|
77
|
-
.replace('{
|
|
77
|
+
.replace('{propertyFormModelName}', '.*')
|
|
78
78
|
.replace('{propertyId}', '.*'));
|
|
79
79
|
if (match) {
|
|
80
80
|
return match[1];
|
|
81
81
|
}
|
|
82
82
|
return null;
|
|
83
83
|
};
|
|
84
|
-
PropertyForm.
|
|
84
|
+
PropertyForm.getPropertyFormModelName = function (grn) {
|
|
85
85
|
var match = grn.match(grnFormat
|
|
86
86
|
.replace('{region}', '.*')
|
|
87
87
|
.replace('{ownerId}', '.*')
|
|
88
88
|
.replace('{namespaceName}', '.*')
|
|
89
89
|
.replace('{userId}', '.*')
|
|
90
|
-
.replace('{
|
|
90
|
+
.replace('{propertyFormModelName}', '(.*)')
|
|
91
91
|
.replace('{propertyId}', '.*'));
|
|
92
92
|
if (match) {
|
|
93
93
|
return match[1];
|
|
@@ -100,7 +100,7 @@ var PropertyForm = /** @class */ (function () {
|
|
|
100
100
|
.replace('{ownerId}', '.*')
|
|
101
101
|
.replace('{namespaceName}', '.*')
|
|
102
102
|
.replace('{userId}', '.*')
|
|
103
|
-
.replace('{
|
|
103
|
+
.replace('{propertyFormModelName}', '.*')
|
|
104
104
|
.replace('{propertyId}', '(.*)'));
|
|
105
105
|
if (match) {
|
|
106
106
|
return match[1];
|
|
@@ -120,7 +120,7 @@ var PropertyForm = /** @class */ (function () {
|
|
|
120
120
|
if (this.getUserId(grn) == null || this.getUserId(grn) === '') {
|
|
121
121
|
return false;
|
|
122
122
|
}
|
|
123
|
-
if (this.
|
|
123
|
+
if (this.getPropertyFormModelName(grn) == null || this.getPropertyFormModelName(grn) === '') {
|
|
124
124
|
return false;
|
|
125
125
|
}
|
|
126
126
|
if (this.getPropertyId(grn) == null || this.getPropertyId(grn) === '') {
|
|
@@ -128,13 +128,13 @@ var PropertyForm = /** @class */ (function () {
|
|
|
128
128
|
}
|
|
129
129
|
return true;
|
|
130
130
|
};
|
|
131
|
-
PropertyForm.createGrn = function (region, ownerId, namespaceName, userId,
|
|
131
|
+
PropertyForm.createGrn = function (region, ownerId, namespaceName, userId, propertyFormModelName, propertyId) {
|
|
132
132
|
return grnFormat
|
|
133
133
|
.replace('{region}', region !== null && region !== void 0 ? region : '')
|
|
134
134
|
.replace('{ownerId}', ownerId !== null && ownerId !== void 0 ? ownerId : '')
|
|
135
135
|
.replace('{namespaceName}', namespaceName !== null && namespaceName !== void 0 ? namespaceName : '')
|
|
136
136
|
.replace('{userId}', userId !== null && userId !== void 0 ? userId : '')
|
|
137
|
-
.replace('{
|
|
137
|
+
.replace('{propertyFormModelName}', propertyFormModelName !== null && propertyFormModelName !== void 0 ? propertyFormModelName : '')
|
|
138
138
|
.replace('{propertyId}', propertyId !== null && propertyId !== void 0 ? propertyId : '');
|
|
139
139
|
};
|
|
140
140
|
PropertyForm.prototype.getFormId = function () {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PropertyForm.js","sourceRoot":"","sources":["PropertyForm.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAGH,wDAA0B;AAC1B,IAAM,SAAS,GAAW,
|
|
1
|
+
{"version":3,"file":"PropertyForm.js","sourceRoot":"","sources":["PropertyForm.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,7 @@ permissions and limitations under the License.
|
|
|
16
16
|
|
|
17
17
|
import IModel from '../../core/interface/IModel';
|
|
18
18
|
import Slot from './Slot';
|
|
19
|
-
const grnFormat: string = "grn:gs2:{region}:{ownerId}:formation:{namespaceName}:user:{userId}:propertyForm:{
|
|
19
|
+
const grnFormat: string = "grn:gs2:{region}:{ownerId}:formation:{namespaceName}:user:{userId}:propertyForm:{propertyFormModelName}:{propertyId}";
|
|
20
20
|
|
|
21
21
|
export default class PropertyForm implements IModel {
|
|
22
22
|
private formId: string|null = null;
|
|
@@ -34,7 +34,7 @@ export default class PropertyForm implements IModel {
|
|
|
34
34
|
.replace('{ownerId}', '.*')
|
|
35
35
|
.replace('{namespaceName}', '.*')
|
|
36
36
|
.replace('{userId}', '.*')
|
|
37
|
-
.replace('{
|
|
37
|
+
.replace('{propertyFormModelName}', '.*')
|
|
38
38
|
.replace('{propertyId}', '.*')
|
|
39
39
|
);
|
|
40
40
|
if (match) {
|
|
@@ -49,7 +49,7 @@ export default class PropertyForm implements IModel {
|
|
|
49
49
|
.replace('{ownerId}', '(.*)')
|
|
50
50
|
.replace('{namespaceName}', '.*')
|
|
51
51
|
.replace('{userId}', '.*')
|
|
52
|
-
.replace('{
|
|
52
|
+
.replace('{propertyFormModelName}', '.*')
|
|
53
53
|
.replace('{propertyId}', '.*')
|
|
54
54
|
);
|
|
55
55
|
if (match) {
|
|
@@ -64,7 +64,7 @@ export default class PropertyForm implements IModel {
|
|
|
64
64
|
.replace('{ownerId}', '.*')
|
|
65
65
|
.replace('{namespaceName}', '(.*)')
|
|
66
66
|
.replace('{userId}', '.*')
|
|
67
|
-
.replace('{
|
|
67
|
+
.replace('{propertyFormModelName}', '.*')
|
|
68
68
|
.replace('{propertyId}', '.*')
|
|
69
69
|
);
|
|
70
70
|
if (match) {
|
|
@@ -79,7 +79,7 @@ export default class PropertyForm implements IModel {
|
|
|
79
79
|
.replace('{ownerId}', '.*')
|
|
80
80
|
.replace('{namespaceName}', '.*')
|
|
81
81
|
.replace('{userId}', '(.*)')
|
|
82
|
-
.replace('{
|
|
82
|
+
.replace('{propertyFormModelName}', '.*')
|
|
83
83
|
.replace('{propertyId}', '.*')
|
|
84
84
|
);
|
|
85
85
|
if (match) {
|
|
@@ -88,13 +88,13 @@ export default class PropertyForm implements IModel {
|
|
|
88
88
|
return null;
|
|
89
89
|
}
|
|
90
90
|
|
|
91
|
-
public static
|
|
91
|
+
public static getPropertyFormModelName(grn: string): string|null {
|
|
92
92
|
const match = grn.match(grnFormat
|
|
93
93
|
.replace('{region}', '.*')
|
|
94
94
|
.replace('{ownerId}', '.*')
|
|
95
95
|
.replace('{namespaceName}', '.*')
|
|
96
96
|
.replace('{userId}', '.*')
|
|
97
|
-
.replace('{
|
|
97
|
+
.replace('{propertyFormModelName}', '(.*)')
|
|
98
98
|
.replace('{propertyId}', '.*')
|
|
99
99
|
);
|
|
100
100
|
if (match) {
|
|
@@ -109,7 +109,7 @@ export default class PropertyForm implements IModel {
|
|
|
109
109
|
.replace('{ownerId}', '.*')
|
|
110
110
|
.replace('{namespaceName}', '.*')
|
|
111
111
|
.replace('{userId}', '.*')
|
|
112
|
-
.replace('{
|
|
112
|
+
.replace('{propertyFormModelName}', '.*')
|
|
113
113
|
.replace('{propertyId}', '(.*)')
|
|
114
114
|
);
|
|
115
115
|
if (match) {
|
|
@@ -131,7 +131,7 @@ export default class PropertyForm implements IModel {
|
|
|
131
131
|
if (this.getUserId(grn) == null || this.getUserId(grn) === '') {
|
|
132
132
|
return false;
|
|
133
133
|
}
|
|
134
|
-
if (this.
|
|
134
|
+
if (this.getPropertyFormModelName(grn) == null || this.getPropertyFormModelName(grn) === '') {
|
|
135
135
|
return false;
|
|
136
136
|
}
|
|
137
137
|
if (this.getPropertyId(grn) == null || this.getPropertyId(grn) === '') {
|
|
@@ -145,7 +145,7 @@ export default class PropertyForm implements IModel {
|
|
|
145
145
|
ownerId: string|null,
|
|
146
146
|
namespaceName: string|null,
|
|
147
147
|
userId: string|null,
|
|
148
|
-
|
|
148
|
+
propertyFormModelName: string|null,
|
|
149
149
|
propertyId: string|null,
|
|
150
150
|
): string|null {
|
|
151
151
|
return grnFormat
|
|
@@ -153,7 +153,7 @@ export default class PropertyForm implements IModel {
|
|
|
153
153
|
.replace('{ownerId}', ownerId ?? '')
|
|
154
154
|
.replace('{namespaceName}', namespaceName ?? '')
|
|
155
155
|
.replace('{userId}', userId ?? '')
|
|
156
|
-
.replace('{
|
|
156
|
+
.replace('{propertyFormModelName}', propertyFormModelName ?? '')
|
|
157
157
|
.replace('{propertyId}', propertyId ?? '');
|
|
158
158
|
}
|
|
159
159
|
public getFormId(): string|null {
|