Skip to content

Commit

Permalink
Merge pull request #20 from hashgraph/develop
Browse files Browse the repository at this point in the history
New UI design
  • Loading branch information
danielnorkin authored Oct 20, 2021
2 parents 74cfc83 + bcbe040 commit cbbfd3b
Show file tree
Hide file tree
Showing 24 changed files with 589 additions and 210 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Ui-service: Contains the back-end for the front-end and contains the Policy Workflow Engine


## [v1.0.0-beta.2] - 2021-10-20

### Added

- New UI design applied

### Fixed

- VP and trust chain display for NFT
- Display of errors during a transaction;
- @hashgraph/sdk version was downgraded to 2.1.0 because of the [issue](https://github.com/hashgraph/hedera-sdk-js/issues/675)
192 changes: 125 additions & 67 deletions Demo Artifacts/irec-policy-config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,25 +31,47 @@
"idType": "OWNER",
"uiMetaData": {
"type": "page",
"title": "iRec Application Form",
"description": "Please fill out this form for the iRec Registration",
"title": "New Installer",
"description": "Description",
"privateFields": [
"policyId"
]
}
},
"id": "644984c0-2b04-445e-9a67-d8e23a421744"
},
{
"tag": "save_new_approve_document",
"blockType": "sendToGuardian",
"dataType": "approve",
"entityType": "Installer",
"stopPropagation": true
"stopPropagation": true,
"uiMetaData": {},
"id": "7f2176d5-0c74-4998-b922-f2d2109a0a4e"
},
{
"tag": "update_approve_document_status",
"blockType": "sendToGuardian",
"dataType": "approve",
"entityType": "Installer",
"uiMetaData": {},
"id": "8991fbb7-5b2e-4028-8a18-7a3de455d49b"
},
{
"tag": "send_installer_vc_to_hedera",
"blockType": "sendToGuardian",
"dataType": "hedera",
"entityType": "Installer",
"uiMetaData": {},
"id": "2f291cb3-9a04-4c0c-955d-82fb8697de6b"
},
{
"tag": "save_installer_vc_document",
"tag": "Submission_of_CSD01_Documentation",
"blockType": "sendToGuardian",
"dataType": "vc-documents",
"entityType": "Installer"
"entityType": "Installer",
"uiMetaData": {},
"stopPropagation": false,
"id": "afead08a-cb8e-4705-b3d3-ff828d535c13"
},
{
"tag": "installer_header",
Expand Down Expand Up @@ -95,7 +117,7 @@
{
"name": "document.id",
"title": "ID",
"type": "button"
"type": "test"
},
{
"name": "document.credentialSubject.0.id",
Expand Down Expand Up @@ -125,52 +147,82 @@
"bindBlock": "download_config_btn"
}
]
}
},
"id": "df49da83-f03a-47c0-9c6b-246d0651f64c"
},
{
"tag": "add_sensor_bnt",
"defaultActive": true,
"tag": "download_config_btn",
"blockType": "interfaceAction",
"permissions": [
"INSTALLER"
],
"blockType": "requestVcDocument",
"schema": "Inverter",
"idType": "DID",
"type": "download",
"schema": "MRV",
"stopPropagation": true,
"targetUrl": "http://message-broker:3003/mrv",
"uiMetaData": {
"type": "dialog",
"description": "Describe the sensor",
"privateFields": [
"policyId"
],
"content": "Create Sensors",
"uiClass": "btn",
"dialogContent": "Please Enter Sensor Information",
"dialogClass": "",
"dialogType": ""
}
},
{
"tag": "save_sensor_vc_document",
"blockType": "sendToGuardian",
"dataType": "vc-documents",
"entityType": "Inverter",
"stopPropagation": true
"content": "download",
"options": []
},
"id": "87f6712f-4e1f-4d65-9871-5a2421a2fb04"
},
{
"tag": "download_config_btn",
"blockType": "interfaceAction",
"defaultActive": true,
"tag": "create_new_sensor_steps",
"permissions": [
"INSTALLER"
],
"type": "download",
"schema": "MRV",
"targetUrl": "http://message-broker:3003/mrv",
"stopPropagation": true,
"blockType": "interfaceStepBlock",
"uiMetaData": {
"content": "download"
}
"type": "blank"
},
"children": [
{
"tag": "add_sensor_bnt",
"defaultActive": true,
"permissions": [
"INSTALLER"
],
"blockType": "requestVcDocument",
"schema": "Inverter",
"idType": "DID",
"uiMetaData": {
"type": "dialog",
"description": "Description",
"privateFields": [
"policyId"
],
"content": "New Sensors",
"uiClass": "btn",
"dialogContent": "New Sensors",
"dialogClass": "",
"dialogType": ""
},
"id": "4f0408bd-6548-48b3-822f-e3e2c363da2f"
},
{
"tag": "send_sensor_vc_to_hedera",
"blockType": "sendToGuardian",
"dataType": "hedera",
"entityType": "Inverter",
"uiMetaData": {},
"id": "387b1ab7-6e20-4164-9869-c4e7534be879"
},
{
"tag": "CSD02_device_registration",
"blockType": "sendToGuardian",
"dataType": "vc-documents",
"entityType": "Inverter",
"stopPropagation": false,
"uiMetaData": {},
"id": "eadd87c7-6dae-4de2-9fd8-a945071f2406"
}
],
"cyclic": true,
"id": "2916b697-0559-4940-8eb1-e2c6cb2bff68"
}
]
],
"id": "091118b9-6674-4f8b-8385-13141fb00be8"
},
{
"tag": "mrv_page",
Expand Down Expand Up @@ -209,7 +261,7 @@
},
{
"name": "document.issuer",
"title": "DID",
"title": "Sensor DID",
"type": "text"
},
{
Expand All @@ -225,13 +277,17 @@
"dialogType": "json"
}
]
}
},
"id": "f18af27b-4ea7-40cc-a16d-f27cb72f0e7f"
}
]
],
"id": "066283a5-19d9-476b-b28f-dfbaff5f6276"
}
]
],
"id": "4ce2f7ca-c1ff-4763-9fca-99186c85d3fc"
}
]
],
"id": "56eca007-3c7f-473d-a2c4-e50b6fca2ee0"
},
{
"tag": "root_authority_header",
Expand Down Expand Up @@ -273,7 +329,8 @@
{
"name": "document.issuer",
"title": "Owner",
"type": "text"
"type": "text",
"tooltip": "Installer did"
},
{
"name": "createDate",
Expand Down Expand Up @@ -309,7 +366,8 @@
}
]
},
"children": []
"children": [],
"id": "77c64bb1-2548-4d65-8fb4-d8125d9ed47f"
},
{
"tag": "approve_documents_btn",
Expand All @@ -325,7 +383,7 @@
"name": "Approve",
"value": "APPROVED",
"uiClass": "btn-approve",
"bindBlock": "save_installer_vc_document"
"bindBlock": "update_approve_document_status"
},
{
"name": "Reject",
Expand All @@ -334,18 +392,14 @@
"bindBlock": "add_new_installer_request"
}
]
}
},
{
"tag": "update_approve_document_status",
"blockType": "sendToGuardian",
"dataType": "approve",
"entityType": "Installer",
"stopPropagation": true
},
"id": "2da3d43a-b2e4-4a78-a1f4-8aa6e2c2d2fb"
}
]
],
"id": "fd7f8862-4155-4659-84a2-a094aaa1bf08"
}
]
],
"id": "2be464b1-84b9-423f-ac57-28590b7b3d08"
},
{
"tag": "mint_events",
Expand All @@ -360,25 +414,29 @@
},
"children": [
{
"tag": "mrv_source",
"blockType": "externalDataBlock",
"entityType": "MRV",
"schema": "MRV"
"schema": "MRV",
"id": "d0fd54aa-deff-468e-a20a-219bd5e3f272"
},
{
"tag": "save_mrv_document",
"tag": "CSD04_requesting_i_Rec_issuance",
"blockType": "sendToGuardian",
"dataType": "vc-documents",
"entityType": "MRV"
"entityType": "MRV",
"id": "ff7601e1-f9ba-429d-932a-8efb545902da"
},
{
"tag": "mint_token",
"blockType": "mintDocument",
"tokenId": "0.0.2776981",
"rule": "1"
"tokenId": "0.0.2880732",
"rule": "1",
"id": "5b64f3b3-d3a0-4026-8bf5-ac6a37c5a316"
}
]
],
"id": "aaa11c02-21af-4609-a98b-fdd8e9934265"
}
]
],
"id": "de4b3c4c-393d-4b89-9926-42a6c762ef09"
}


Loading

0 comments on commit cbbfd3b

Please sign in to comment.