Skip to content

Commit a7f26fd

Browse files
brancoderbrancoder
authored
Merge pull request #66 from iotaledger/feat/refine-search
Feat: Refine search
2 parents e9f2b6a + 2dd335a commit a7f26fd

File tree

12 files changed

+579
-416
lines changed

12 files changed

+579
-416
lines changed

‎.github/workflows/build-stardust.yml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Client Build Stardust
2+
3+
on:
4+
push:
5+
branches: [feat/stardust]
6+
paths:
7+
- "src/**"
8+
- ".github/workflows/build-stardust.yml"
9+
pull_request:
10+
branches: [feat/stardust]
11+
paths:
12+
- "src/**"
13+
- ".github/workflows/build-stardust.yml"
14+
15+
jobs:
16+
build:
17+
runs-on: ubuntu-latest
18+
19+
steps:
20+
- uses: actions/checkout@v2
21+
- name: Use Node.js 14.x
22+
uses: actions/setup-node@v1
23+
with:
24+
node-version: "14"
25+
- name: Client Build
26+
run: |
27+
npm install
28+
npm run build

‎package-lock.json‎

Lines changed: 315 additions & 295 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"license": "MIT",
1111
"dependencies": {
12-
"@iota/iota.js": "^1.9.0-stardust.5",
12+
"@iota/iota.js": "^1.9.0-stardust.6",
1313
"classnames": "^2.3.1",
1414
"humanize-duration": "^3.25.2",
1515
"moment": "^2.29.1",

‎src/app/components/tangle/MilestonePayload.tsx‎

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -85,27 +85,34 @@ class MilestonePayload extends Component<MilestonePayloadProps> {
8585
</div>
8686
</React.Fragment>
8787
)}
88-
{this.props.payload.publicKeys && (
88+
{this.props.payload.metadata && (
8989
<React.Fragment>
9090
<div className="card--label">
91-
Public Keys
91+
Metadata
9292
</div>
9393
<div className="card--value card--value__mono">
94-
{this.props.payload.publicKeys?.map(pubKey => (
95-
<div key={pubKey} className="margin-b-s">
96-
{pubKey}
97-
</div>
98-
))}
94+
{this.props.payload.metadata}
9995
</div>
10096
</React.Fragment>
10197
)}
10298
<div className="card--label">
10399
Signatures
104100
</div>
105101
<div className="card--value card--value__mono">
106-
{this.props.payload.signatures.map(sig => (
107-
<div key={sig} className="margin-b-s">
108-
{sig}
102+
{this.props.payload.signatures.map((sig, i) => (
103+
<div key={i} className="margin-b-s">
104+
<div className="card--label">
105+
Public Key
106+
</div>
107+
<div className="card--value card--value__mono">
108+
{sig.publicKey}
109+
</div>
110+
<div className="card--label">
111+
Signature
112+
</div>
113+
<div className="card--value card--value__mono">
114+
{sig.signature}
115+
</div>
109116
</div>
110117
))}
111118
</div>

‎src/app/components/tangle/Output.tsx‎

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { BASIC_OUTPUT_TYPE, ALIAS_OUTPUT_TYPE, FOUNDRY_OUTPUT_TYPE, NFT_OUTPUT_TYPE, TREASURY_OUTPUT_TYPE, UnitsHelper, IOutputResponse } from "@iota/iota.js";
1+
import { BASIC_OUTPUT_TYPE, ALIAS_OUTPUT_TYPE, FOUNDRY_OUTPUT_TYPE, NFT_OUTPUT_TYPE, TREASURY_OUTPUT_TYPE, UnitsHelper, IOutputResponse, SIMPLE_TOKEN_SCHEME_TYPE } from "@iota/iota.js";
22
import React, { Component, ReactNode } from "react";
33
import { Link } from "react-router-dom";
44
import { ClipboardHelper } from "../../../utils/clipboardHelper";
@@ -34,7 +34,7 @@ class Output extends Component<OutputProps, OutputState> {
3434
public render(): ReactNode {
3535
return (
3636
<div className="output">
37-
<h2>{NameHelper.getOutputTypeName(this.state.output.type)} {this.props.index}</h2>
37+
<h2>{this.props.index}. {NameHelper.getOutputTypeName(this.state.output.type)}</h2>
3838
{/* Diplay metadata for Output Response */}
3939
{this.isOutputResponse(this.props.output) && (
4040
<React.Fragment>
@@ -177,30 +177,34 @@ class Output extends Component<OutputProps, OutputState> {
177177
<div className="card--value row">
178178
{this.state.output.tokenTag}
179179
</div>
180-
<div className="card--label">
181-
Minted tokens:
182-
</div>
183-
<div className="card--value row">
184-
{this.state.output.mintedTokens}
185-
</div>
186-
<div className="card--label">
187-
Melted tokens:
188-
</div>
189-
<div className="card--value row">
190-
{this.state.output.meltedTokens}
191-
</div>
192-
<div className="card--label">
193-
Maximum supply:
194-
</div>
195-
<div className="card--value row">
196-
{this.state.output.maximumSupply}
197-
</div>
198180
<div className="card--label">
199181
Token scheme type:
200182
</div>
201183
<div className="card--value row">
202184
{this.state.output.tokenScheme.type}
203185
</div>
186+
{this.state.output.tokenScheme.type === SIMPLE_TOKEN_SCHEME_TYPE && (
187+
<React.Fragment>
188+
<div className="card--label">
189+
Minted tokens:
190+
</div>
191+
<div className="card--value row">
192+
{this.state.output.tokenScheme.mintedTokens}
193+
</div>
194+
<div className="card--label">
195+
Melted tokens:
196+
</div>
197+
<div className="card--value row">
198+
{this.state.output.tokenScheme.meltedTokens}
199+
</div>
200+
<div className="card--label">
201+
Maximum supply:
202+
</div>
203+
<div className="card--value row">
204+
{this.state.output.tokenScheme.maximumSupply}
205+
</div>
206+
</React.Fragment>
207+
)}
204208
</React.Fragment>
205209
)}
206210

‎src/app/components/tangle/IndexationPayload.tsx‎ renamed to ‎src/app/components/tangle/TaggedDataPayload.tsx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@ import { Converter } from "@iota/util.js";
22
import React, { Component, ReactNode } from "react";
33
import { Link } from "react-router-dom";
44
import { ClipboardHelper } from "../../../utils/clipboardHelper";
5-
import MessageButton from "../../components/layout/MessageButton";
5+
import MessageButton from "../layout/MessageButton";
66
import { TaggedDataPayloadProps } from "./TaggedDataPayloadProps";
77
import { TaggedDataPayloadState } from "./TaggedDataPayloadState";
88

99
/**
10-
* Component which will display a indexation payload.
10+
* Component which will display a Tagged data payload.
1111
*/
12-
class IndexationPayload extends Component<TaggedDataPayloadProps, TaggedDataPayloadState> {
12+
class TaggedDataPayload extends Component<TaggedDataPayloadProps, TaggedDataPayloadState> {
1313
/**
14-
* Create a new instance of IndexationPayload.
14+
* Create a new instance of TaggedDataPayload.
1515
* @param props The props.
1616
*/
1717
constructor(props: TaggedDataPayloadProps) {
@@ -54,7 +54,7 @@ class IndexationPayload extends Component<TaggedDataPayloadProps, TaggedDataPayl
5454
public render(): ReactNode {
5555
return (
5656
<div className="indexation-payload">
57-
<h2>Indexation Payload</h2>
57+
<h2>Tagged Data Payload</h2>
5858
<div className="card--label row middle">
5959
<span className="margin-r-t">Index UTF8 [{this.state.indexLengthBytes}]</span>
6060
<MessageButton
@@ -143,4 +143,4 @@ class IndexationPayload extends Component<TaggedDataPayloadProps, TaggedDataPayl
143143
}
144144
}
145145

146-
export default IndexationPayload;
146+
export default TaggedDataPayload;

‎src/app/components/tangle/TaggedDataPayloadProps.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { ITaggedDataPayload } from "@iota/iota.js";
22

33
export interface TaggedDataPayloadProps {
44
/**
5-
* The indexation payload.
5+
* The tagged data payload.
66
*/
77
payload: ITaggedDataPayload;
88
}

‎src/app/components/tangle/UnlockCondition.tsx‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -92,14 +92,9 @@ class UnlockCondition extends Component<UnlockConditionProps> {
9292
</React.Fragment>
9393
)}
9494
{this.props.unlockCondition.type === IMMUTABLE_ALIAS_UNLOCK_CONDITION_TYPE && (
95-
<React.Fragment>
96-
<div className="card--label">
97-
Immutable address:
98-
</div>
99-
<Address
100-
address={this.props.unlockCondition.address}
101-
/>
102-
</React.Fragment>
95+
<Address
96+
address={this.props.unlockCondition.address}
97+
/>
10398
)}
10499
<div className="card--label">
105100
Type:

‎src/app/routes/Search.tsx‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,17 +93,25 @@ class Search extends AsyncComponent<RouteComponentProps<SearchRouteProps>, Searc
9393
<span>Addresses</span>
9494
<span>64 Hex characters or Bech32 Format</span>
9595
</li>
96+
<li>
97+
<span>Nft/Alias Addresses</span>
98+
<span>40 Hex characters or Bech32 Format</span>
99+
</li>
96100
<li>
97101
<span>Outputs</span>
98-
<span>68 Hex characters</span>
102+
<span>68 Hex characters or tag</span>
99103
</li>
100104
<li>
101-
<span>Milestone Index</span>
102-
<span>Numeric</span>
105+
<span>Foundry Id</span>
106+
<span>52 Hex characters</span>
103107
</li>
104108
<li>
105-
<span>Indexes</span>
106-
<span>Maximum 64 UTF-8 chars or maximum 128 hex chars</span>
109+
<span>Token Id</span>
110+
<span>76 Hex characters</span>
111+
</li>
112+
<li>
113+
<span>Milestone Index</span>
114+
<span>Numeric</span>
107115
</li>
108116
</ul>
109117
</React.Fragment>

‎src/app/routes/explorer/Message.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ import AsyncComponent from "../../components/layout/AsyncComponent";
1414
import MessageButton from "../../components/layout/MessageButton";
1515
import Spinner from "../../components/layout/Spinner";
1616
import InclusionState from "../../components/tangle/InclusionState";
17-
import IndexationPayload from "../../components/tangle/IndexationPayload";
1817
import MessageTangleState from "../../components/tangle/MessageTangleState";
1918
import MilestonePayload from "../../components/tangle/MilestonePayload";
2019
import ReceiptPayload from "../../components/tangle/ReceiptPayload";
20+
import TaggedDataPayload from "../../components/tangle/TaggedDataPayload";
2121
import TransactionPayload from "../../components/tangle/TransactionPayload";
2222
import "./Message.scss";
2323
import { MessageRouteProps } from "./MessageRouteProps";
@@ -225,7 +225,7 @@ class Message extends AsyncComponent<RouteComponentProps<MessageRouteProps>, Mes
225225
<TransactionPayload payload={this.state.message.payload} />
226226
{this.state.message.payload.essence.payload && (
227227
<div className="card margin-t-m padding-l">
228-
<IndexationPayload
228+
<TaggedDataPayload
229229
payload={this.state.message.payload.essence.payload}
230230
/>
231231
</div>
@@ -246,7 +246,7 @@ class Message extends AsyncComponent<RouteComponentProps<MessageRouteProps>, Mes
246246
)}
247247
{this.state.message.payload.type === TAGGED_DATA_PAYLOAD_TYPE && (
248248
<div className="card margin-t-m padding-l">
249-
<IndexationPayload payload={this.state.message.payload} />
249+
<TaggedDataPayload payload={this.state.message.payload} />
250250
</div>
251251
)}
252252
</React.Fragment>

0 commit comments

Comments
 (0)