Skip to content

Commit

Permalink
Merged in feature/SHIBUI-1385 (pull request #360)
Browse files Browse the repository at this point in the history 
SHIBUI-1385 Implemented version restore editing

Approved-by: Ryan Mathis <rmathis@unicon.net>
  • Loading branch information
@rmathis
rmathis committed Sep 5, 2019
2 parents 6e2baee + c831e9e commit 7993d5e
Show file tree
Hide file tree
Showing 101 changed files with 1,859 additions and 513 deletions.
13 changes: 10 additions & 3 deletions backend/src/integration/resources/SHIBUI-1334-1.side
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2219,7 +2219,7 @@
"id": "c2d29077-30c4-45cf-81c9-b5790294e11e",
"comment": "",
"command": "click",
"target": "css=.btn-info > translate-i18n",
"target": "css=.btn-info",
"targets": [
["css=.btn-info > translate-i18n", "css:finder"],
["xpath=//div[2]/button/translate-i18n", "xpath:position"],
Expand All @@ -2230,7 +2230,7 @@
"id": "f2e3d420-5cf5-4165-94da-41688839cf82",
"comment": "",
"command": "click",
"target": "css=.btn-link:nth-child(1) > translate-i18n",
"target": "css=.btn-link:nth-child(1)",
"targets": [
["css=.btn-link:nth-child(1) > translate-i18n", "css:finder"],
["xpath=//div[@id='navigation']/div/a/translate-i18n", "xpath:idRelative"],
Expand All @@ -2253,7 +2253,7 @@
"id": "68972f7d-8268-4701-865c-585a39987208",
"comment": "",
"command": "click",
"target": "css=tr:nth-child(2) .custom-control-label",
"target": "css=tr:nth-child(3) .custom-control-label",
"targets": [
["css=tr:nth-child(2) .custom-control-label", "css:finder"],
["xpath=//tr[2]/td/div/label", "xpath:position"]
Expand All @@ -2270,6 +2270,13 @@
["xpath=//button[contains(.,'Compare Selected(2)')]", "xpath:innerText"]
],
"value": ""
}, {
"id": "98aafaee-a430-4a2d-9aa5-b4c9ce0c4908",
"comment": "",
"command": "waitForElementVisible",
"target": "css=.mb-4:nth-child(2) primitive-property:nth-child(1) .d-block:nth-child(2)",
"targets": [],
"value": "10000"
}, {
"id": "5a976e2c-dc5f-4021-9cc6-3cad12e771ea",
"comment": "",
Expand Down
90 changes: 67 additions & 23 deletions backend/src/integration/resources/SHIBUI-1334-2.side
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,13 @@
["xpath=//li[2]/button", "xpath:position"]
],
"value": ""
}, {
"id": "d072327c-78b4-4bdb-8020-b825cd26592d",
"comment": "",
"command": "waitForElementVisible",
"target": "id=/xmlId",
"targets": [],
"value": "10000"
}, {
"id": "86262eda-4a44-41b0-b7aa-fa46406e2601",
"comment": "",
Expand Down Expand Up @@ -578,15 +585,9 @@
}, {
"id": "5636ef67-71fb-4bca-ba58-7ecf926c7bf0",
"comment": "",
"command": "click",
"target": "id=/xmlId",
"targets": [
["id=/xmlId", "id"],
["name=field38", "name"],
["css=#\\/xmlId", "css:finder"],
["xpath=//input[@id='/xmlId']", "xpath:attributes"],
["xpath=//custom-string/div/input", "xpath:position"]
],
"command": "pause",
"target": "5000",
"targets": [],
"value": ""
}, {
"id": "7d641e58-47ce-4d20-908c-e0002ff73cfa",
Expand All @@ -600,7 +601,14 @@
["xpath=//input[@id='/xmlId']", "xpath:attributes"],
["xpath=//custom-string/div/input", "xpath:position"]
],
"value": "123 v2"
"value": "123 version 2"
}, {
"id": "b78c81e9-41ac-41db-837a-0db6bd4f77eb",
"comment": "",
"command": "pause",
"target": "5000",
"targets": [],
"value": ""
}, {
"id": "247b04c1-e690-42bc-ae15-dfbedb44d2e9",
"comment": "",
Expand All @@ -624,6 +632,13 @@
["xpath=//button[contains(.,'Save')]", "xpath:innerText"]
],
"value": ""
}, {
"id": "eb08417b-b8f0-46dc-9e32-e8daf3bc205d",
"comment": "",
"command": "pause",
"target": "2000",
"targets": [],
"value": ""
}, {
"id": "cf005a45-74ae-4f7a-a53c-ed59d63f7114",
"comment": "",
Expand Down Expand Up @@ -699,7 +714,7 @@
["xpath=//primitive-property[4]/div/span[2]", "xpath:position"],
["xpath=//span[contains(.,'123 v2')]", "xpath:innerText"]
],
"value": "123 v2"
"value": "123 version 2"
}, {
"id": "a13198b9-7827-47e2-ade3-143b981d34ee",
"comment": "",
Expand Down Expand Up @@ -782,17 +797,11 @@
],
"value": ""
}, {
"id": "78967fb5-8f61-46ce-9c14-9b6ceb12b03a",
"id": "270a048e-b903-4bc1-b95b-06ffbdef99de",
"comment": "",
"command": "click",
"target": "css=#\\/httpMetadataResolverAttributes\\/connectionRequestTimeout-container .btn",
"targets": [
["css=#\\/httpMetadataResolverAttributes\\/connectionRequestTimeout-container .btn", "css:finder"],
["xpath=(//button[@type='button'])[2]", "xpath:attributes"],
["xpath=//div[@id='/httpMetadataResolverAttributes/connectionRequestTimeout-container']/div/div/button", "xpath:idRelative"],
["xpath=//auto-complete/div/div/div/button", "xpath:position"],
["xpath=//button[contains(.,'Toggle Dropdown')]", "xpath:innerText"]
],
"command": "pause",
"target": "3000",
"targets": [],
"value": ""
}, {
"id": "1cde012c-d521-4fd5-a7d5-7a680bba0e7b",
Expand All @@ -806,7 +815,14 @@
],
"value": ""
}, {
"id": "d00ecf98-7425-467c-acbb-3b39918e3462",
"id": "863e9f5e-a3d6-47e9-8b65-de639029812a",
"comment": "",
"command": "waitForElementVisible",
"target": "css=#\\/httpMetadataResolverAttributes\\/connectionRequestTimeout-container .btn",
"targets": [],
"value": "10000"
}, {
"id": "78967fb5-8f61-46ce-9c14-9b6ceb12b03a",
"comment": "",
"command": "click",
"target": "css=#\\/httpMetadataResolverAttributes\\/connectionRequestTimeout-container .btn",
Expand All @@ -818,6 +834,13 @@
["xpath=//button[contains(.,'Toggle Dropdown')]", "xpath:innerText"]
],
"value": ""
}, {
"id": "8277f894-0bbd-41f7-b3bb-1aba2a0f80be",
"comment": "",
"command": "waitForElementVisible",
"target": "id=/httpMetadataResolverAttributes/connectionRequestTimeout__option--1",
"targets": [],
"value": "10000"
}, {
"id": "8ba62572-354d-47f4-bb72-f9309c1cb201",
"comment": "",
Expand All @@ -844,6 +867,13 @@
["xpath=//div[2]/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"]
],
"value": ""
}, {
"id": "7014a534-b908-482f-85d2-7f7031741b04",
"comment": "",
"command": "waitForElementVisible",
"target": "id=/httpMetadataResolverAttributes/connectionTimeout__option--2",
"targets": [],
"value": "10000"
}, {
"id": "337ac160-7990-425f-83da-2788d8a0985e",
"comment": "",
Expand All @@ -869,6 +899,13 @@
["xpath=//div[3]/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"]
],
"value": ""
}, {
"id": "c28e3ee6-e536-4eb7-914b-896b2ec2cb9e",
"comment": "",
"command": "waitForElementVisible",
"target": "id=/httpMetadataResolverAttributes/socketTimeout__option--3",
"targets": [],
"value": "10000"
}, {
"id": "34693225-4754-4b27-92ee-3e37304a8cd7",
"comment": "",
Expand All @@ -893,6 +930,13 @@
["xpath=//button[contains(.,'Save')]", "xpath:innerText"]
],
"value": ""
}, {
"id": "c3ad6c24-736a-492a-8952-b368e123d8e1",
"comment": "",
"command": "waitForElementVisible",
"target": "linkText=Test Metadata Provider",
"targets": [],
"value": "10000"
}, {
"id": "8868c054-2e6a-403e-ba2b-499a56730d71",
"comment": "",
Expand All @@ -911,7 +955,7 @@
"id": "0092cd5c-a885-4a48-a233-b3af447b02bc",
"comment": "",
"command": "click",
"target": "css=.btn-link:nth-child(1) > translate-i18n",
"target": "css=.btn-link:nth-child(1)",
"targets": [
["css=.btn-link:nth-child(1) > translate-i18n", "css:finder"],
["xpath=//div[@id='navigation']/div/a/translate-i18n", "xpath:idRelative"],
Expand Down
51 changes: 50 additions & 1 deletion backend/src/integration/resources/SHIBUI-1361.side
View file
Original file line number Diff line number Diff line change
Expand Up @@ -601,6 +601,13 @@
"target": "id=/xmlId",
"targets": [],
"value": "10000"
}, {
"id": "0aae114c-3e79-4d57-8f40-e669887a8545",
"comment": "",
"command": "pause",
"target": "2000",
"targets": [],
"value": ""
}, {
"id": "7d641e58-47ce-4d20-908c-e0002ff73cfa",
"comment": "",
Expand Down Expand Up @@ -702,6 +709,13 @@
["xpath=//button[contains(.,'  Restore')]", "xpath:innerText"]
],
"value": "10000"
}, {
"id": "271939a6-6196-4c14-aa13-e6c31e0373c2",
"comment": "",
"command": "pause",
"target": "5000",
"targets": [],
"value": ""
}, {
"id": "c223e329-733c-41eb-9e85-c6f69a840179",
"comment": "",
Expand Down Expand Up @@ -857,6 +871,13 @@
["xpath=//button[contains(.,'Toggle Dropdown')]", "xpath:innerText"]
],
"value": ""
}, {
"id": "6e01f905-fd32-45a5-9517-9dd12191f7ae",
"comment": "",
"command": "waitForElementVisible",
"target": "id=/httpMetadataResolverAttributes/connectionRequestTimeout__option--1",
"targets": [],
"value": "10000"
}, {
"id": "8ba62572-354d-47f4-bb72-f9309c1cb201",
"comment": "",
Expand All @@ -883,6 +904,13 @@
["xpath=//div[2]/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"]
],
"value": ""
}, {
"id": "01d5f751-6964-4fd8-a0de-36fd79d7be99",
"comment": "",
"command": "waitForElementVisible",
"target": "id=/httpMetadataResolverAttributes/connectionTimeout__option--2",
"targets": [],
"value": "10000"
}, {
"id": "337ac160-7990-425f-83da-2788d8a0985e",
"comment": "",
Expand All @@ -908,6 +936,13 @@
["xpath=//div[3]/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"]
],
"value": ""
}, {
"id": "99c7ec5a-ad8c-4970-b97f-27997098c0d6",
"comment": "",
"command": "waitForElementVisible",
"target": "id=/httpMetadataResolverAttributes/socketTimeout__option--3",
"targets": [],
"value": "10000"
}, {
"id": "34693225-4754-4b27-92ee-3e37304a8cd7",
"comment": "",
Expand All @@ -932,6 +967,13 @@
["xpath=//button[contains(.,'Save')]", "xpath:innerText"]
],
"value": ""
}, {
"id": "4e2831c6-d1ba-409d-a0cc-7a25dad75421",
"comment": "",
"command": "waitForElementVisible",
"target": "linkText=Test Metadata Provider",
"targets": [],
"value": "10000"
}, {
"id": "8868c054-2e6a-403e-ba2b-499a56730d71",
"comment": "",
Expand Down Expand Up @@ -1050,6 +1092,13 @@
"target": "isDate",
"targets": [],
"value": "true"
}, {
"id": "48fc4781-3313-4f56-8546-00e8210d9641",
"comment": "",
"command": "pause",
"target": "5000",
"targets": [],
"value": ""
}, {
"id": "2cfe222d-a506-4f2b-8840-4b4a76cf2bfb",
"comment": "",
Expand All @@ -1065,7 +1114,7 @@
"id": "a10e3e37-28f1-403f-b572-8b4020de7904",
"comment": "",
"command": "click",
"target": "css=tr:nth-child(2) .custom-control-label",
"target": "css=tr:nth-child(3) .custom-control-label",
"targets": [
["css=tr:nth-child(2) .custom-control-label", "css:finder"],
["xpath=//tr[2]/td/div/label", "xpath:position"]
Expand Down
1 change: 1 addition & 0 deletions backend/src/main/resources/i18n/messages.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ action.restore=Restore
value.enabled=Enabled
value.disabled=Disabled
value.current=Current
value.not-current=Not Current
value.none=None
value.file=File
value.memory=Memory
Expand Down
8 changes: 4 additions & 4 deletions ui/src/app/metadata/configuration/action/configuration.action.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,13 @@ export class SetMetadataModel implements Action {
constructor(public payload: Metadata) { }
}

export class SetDefinition implements Action {
export class SetConfigurationDefinition implements Action {
readonly type = ConfigurationActionTypes.SET_DEFINITION;

constructor(public payload: Wizard<Metadata>) { }
}

export class SetSchema implements Action {
export class SetConfigurationSchema implements Action {
readonly type = ConfigurationActionTypes.SET_SCHEMA;

constructor(public payload: Schema) { }
Expand Down Expand Up @@ -105,8 +105,8 @@ export type ConfigurationActionsUnion =
| LoadXmlSuccess
| LoadXmlError
| SetMetadata
| SetDefinition
| SetSchema
| SetConfigurationDefinition
| SetConfigurationSchema
| SetXml
| DownloadXml
| ClearConfiguration;
Loading

0 comments on commit 7993d5e

Please sign in to comment.