Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"version": "3.0.0",
"license": "MIT",
"scripts": {
"start": "NODE_OPTIONS=--openssl-legacy-provider react-scripts start",
"start": "react-scripts start",
"build": "yarn build:theme && react-scripts --max_old_space_size=4096 build",
"build:theme": "lessc --js ./src/bootstrap/theme.less ./src/bootstrap/theme.css",
"release": "standard-version",
Expand Down
55 changes: 27 additions & 28 deletions src/components/light-search-bar.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ const OptionItem = ({ item }) => {
// there are a few ethers queries coming from here.
// they might have to be changed to subgraph queries
// TODO read and figure it out
const { itemID, metadata: itemMetadata, registry } = item
const { itemID, props, registry } = item
const { id: tcrAddress } = registry
const {
gtcrView,
Expand Down Expand Up @@ -111,14 +111,14 @@ const OptionItem = ({ item }) => {
<>
<StyledItemField>
<DisplaySelector
type={itemMetadata?.props?.[0]?.type}
value={itemMetadata?.props?.[0]?.value}
allowedFileTypes={itemMetadata?.props?.[0]?.allowedFileTypes}
type={props?.[0]?.type}
value={props?.[0]?.value}
allowedFileTypes={props?.[0]?.allowedFileTypes}
/>
</StyledItemField>
</>
) : (
itemMetadata?.props
props
.filter(col => col.isIdentifier)
.map((column, j) => (
<StyledItemField key={j}>
Expand All @@ -139,22 +139,18 @@ const OptionItem = ({ item }) => {
)
}

OptionItem.propTypes = {
item: PropTypes.shape({
itemID: PropTypes.string,
metadata: PropTypes.shape({
props: PropTypes.arrayOf(
PropTypes.shape({
type: PropTypes.oneOf(Object.values(ItemTypes)),
value: PropTypes.string.isRequired
})
)
}),
registry: PropTypes.shape({
id: PropTypes.string
OptionItem.propTypes = PropTypes.shape({
itemID: PropTypes.string,
props: PropTypes.arrayOf(
PropTypes.shape({
type: PropTypes.oneOf(Object.values(ItemTypes)),
value: PropTypes.string.isRequired
})
}).isRequired
}
),
registry: PropTypes.shape({
id: PropTypes.string
})
}).isRequired

const LightSearchBar = () => {
const [value, setValue] = useState()
Expand All @@ -166,15 +162,18 @@ const LightSearchBar = () => {

const [debouncedCallback] = useDebouncedCallback(input => {
if (!input || input.length === 0) setData([])
else
else {
const where = {
keywords: { _ilike: `%${input.trim()}%` },
registry_id: { _eq: tcrAddress.toLowerCase() }
}
makeItemSearchQuery({
variables: {
text: `${tcrAddress.toLowerCase()} & ${input
.trim()
.replace(' ', ' & ')}:*`,
where: where,
first: MAX_ITEM_COUNT
}
})
}
setWriting(false)
}, 700)

Expand All @@ -184,7 +183,7 @@ const LightSearchBar = () => {
}, [itemSearchQuery])

const options = data.map(d => {
const itemLabels = d.item?.metadata?.props.filter(prop =>
const itemLabels = d?.props.filter(prop =>
searchableFields.includes(prop.type)
)

Expand All @@ -193,11 +192,11 @@ const LightSearchBar = () => {
label =
itemLabels.find(prop => prop.type === ItemTypes.TEXT)?.value ||
itemLabels[0].value
else label = d.item.itemID
else label = d.itemID

return (
<Select.Option key={d.item.itemID} label={label}>
<OptionItem item={d.item} tcrAddress={d.item.registry.id} />
<Select.Option key={d.itemID} label={label}>
<OptionItem item={d} tcrAddress={d.registry.id} />
</Select.Option>
)
})
Expand Down
20 changes: 10 additions & 10 deletions src/components/request-timelines.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,11 @@ const Timeline = ({ request, item, metaEvidence }) => {
name: 'Evidence',
timestamp: e.timestamp,
transactionHash: e.txHash,
title: e.metadata?.title,
description: e.metadata?.description,
URI: e.URI,
fileURI: e.metadata?.fileURI,
fileTypeExtension: e.metadata?.fileTypeExtension,
title: e.title,
description: e.description,
URI: e.uri,
fileURI: e.fileURI,
fileTypeExtension: e.fileTypeExtension,
party: e.party
}))

Expand All @@ -117,13 +117,13 @@ const Timeline = ({ request, item, metaEvidence }) => {
useEffect(() => {
const evidenceManualFetch = async () => {
const unindexedEvidenceURIs = logs
.filter(e => e.metadata?.name === 'Evidence')
.filter(e => e.name === 'Evidence')
.filter(
e =>
e.metadata?.title === null &&
e.metadata?.description === null &&
e.metadata?.fileURI === null &&
e.metadata?.fileTypeExtension === null
e.title === null &&
e.description === null &&
e.fileURI === null &&
e.fileTypeExtension === null
)
.map(e => e.URI)

Expand Down
4 changes: 2 additions & 2 deletions src/hooks/factory.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const useFactory = () => {
const query = {
query: `
{
lregistry(id: "${tcrAddress.toLowerCase()}") {
lregistry:LRegistry_by_pk(id: "${tcrAddress.toLowerCase()}") {
id
}
}
Expand Down Expand Up @@ -48,7 +48,7 @@ const useFactory = () => {
const query = {
query: `
{
registry(id: "${tcrAddress.toLowerCase()}") {
registry:Registry_by_pk(id: "${tcrAddress.toLowerCase()}") {
id
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/hooks/light-tcr-view.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import { parseIpfs } from 'utils/ipfs-parse'
export const fetchMetaEvidence = async (tcr, networkId) => {
const query = {
query: `{
lregistry(id: "${tcr.toLowerCase()}") {
lregistry:LRegistry_by_pk(id: "${tcr.toLowerCase()}") {
registrationMetaEvidence {
URI
uri
}
connectedTCR
}
Expand All @@ -29,7 +29,7 @@ export const fetchMetaEvidence = async (tcr, networkId) => {

const { data } = await response.json()
return {
metaEvidenceURI: data.lregistry.registrationMetaEvidence.URI,
metaEvidenceURI: data.lregistry.registrationMetaEvidence.uri,
connectedTCR: data.lregistry.connectedTCR
}
}
Expand Down
12 changes: 6 additions & 6 deletions src/hooks/tcr-view.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ import { parseIpfs } from 'utils/ipfs-parse'
export const fetchMetaEvidence = async (tcr, networkId) => {
const query = {
query: `{
registry(id: "${tcr.toLowerCase()}") {
registry:Registry_by_pk(id: "${tcr.toLowerCase()}") {
registrationMetaEvidence {
URI
uri
}
connectedTCR
}
lregistry(id: "${tcr.toLowerCase()}") {
lregistry:LRegistry_by_pk(id: "${tcr.toLowerCase()}") {
registrationMetaEvidence {
URI
uri
}
connectedTCR
}
Expand Down Expand Up @@ -65,12 +65,12 @@ export const fetchMetaEvidence = async (tcr, networkId) => {
if (!data?.registry && !data?.lregistry && !pgtcrData?.registry) return null
else if (data.registry !== null)
return {
metaEvidenceURI: data.registry.registrationMetaEvidence.URI,
metaEvidenceURI: data.registry.registrationMetaEvidence.uri,
connectedTCR: data.registry.connectedTCR
}
else if (data.lregistry !== null)
return {
metaEvidenceURI: data.lregistry.registrationMetaEvidence.URI,
metaEvidenceURI: data.lregistry.registrationMetaEvidence.uri,
connectedTCR: data.lregistry.connectedTCR
}
else
Expand Down
40 changes: 25 additions & 15 deletions src/pages/items/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,30 +96,40 @@ const Items = () => {
const orderDirection = oldestFirst ? 'asc' : 'desc'

const itemsWhere = useMemo(() => {
if (absent) return { registry: tcrAddress.toLowerCase(), status: 'Absent' }
if (absent)
return {
registry_id: { _eq: tcrAddress.toLowerCase() },
status: { _eq: 'Absent' }
}
if (registered)
return { registry: tcrAddress.toLowerCase(), status: 'Registered' }
return {
registry_id: { _eq: tcrAddress.toLowerCase() },
status: { _eq: 'Registered' }
}
if (submitted)
return {
registry: tcrAddress.toLowerCase(),
status: 'RegistrationRequested'
registry_id: { _eq: tcrAddress.toLowerCase() },
status: { _eq: 'RegistrationRequested' }
}
if (removalRequested)
return { registry: tcrAddress.toLowerCase(), status: 'ClearingRequested' }
return {
registry_id: { _eq: tcrAddress.toLowerCase() },
status: { _eq: 'ClearingRequested' }
}
if (challengedSubmissions)
return {
registry: tcrAddress.toLowerCase(),
status: 'RegistrationRequested',
disputed: true
registry_id: { _eq: tcrAddress.toLowerCase() },
status: { _eq: 'RegistrationRequested' },
disputed: { _eq: true }
}
if (challengedRemovals)
return {
registry: tcrAddress.toLowerCase(),
status: 'ClearingRequested',
disputed: true
registry_id: { _eq: tcrAddress.toLowerCase() },
status: { _eq: 'ClearingRequested' },
disputed: { _eq: true }
}

return { registry: tcrAddress.toLowerCase() }
return { registry_id: { _eq: tcrAddress.toLowerCase() } }
}, [
absent,
challengedRemovals,
Expand All @@ -142,9 +152,9 @@ const Items = () => {
() =>
getItems({
variables: {
skip: (Number(page) - 1) * ITEMS_PER_PAGE,
first: MAX_ENTITIES,
orderDirection: orderDirection,
offset: (Number(page) - 1) * ITEMS_PER_PAGE,
limit: MAX_ENTITIES,
order_by: [{ latestRequestSubmissionTime: orderDirection }],
where: itemsWhere
}
}),
Expand Down
28 changes: 13 additions & 15 deletions src/pages/light-item-details/badges/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ const mapToLegacy = items =>
items
.map(item => ({
...item,
decodedData: item.metadata?.props.map(({ value }) => value),
mergedData: item.metadata?.props
decodedData: item?.props.map(({ value }) => value),
mergedData: item?.props
}))
.map(
({
Expand Down Expand Up @@ -320,31 +320,29 @@ const Badges = ({ connectedTCRAddr, item, tcrAddress }) => {
const query = {
query: `
{
litems (where:{
registry: "${badgeAddr.toLowerCase()}",
metadata_: {keywords: "${keywords}"}
litems:LItem (where:{
registry_id: { _eq: "${badgeAddr.toLowerCase()}" },
keywords: { _eq: "${keywords}" }
}) {
itemID
status
data
metadata{
props {
value
type
label
description
isIdentifier
}
props {
value
type: itemType
label
description
isIdentifier
}
requests(first: 1, orderBy: submissionTime, orderDirection: desc) {
requests(limit: 1, order_by: { submissionTime: desc }) {
disputed
disputeID
submissionTime
resolved
requester
challenger
resolutionTime
rounds(first: 1, orderBy: creationTime, orderDirection: desc) {
rounds(limit: 1, order_by: { creationTime: desc }) {
appealPeriodStart
appealPeriodEnd
ruling
Expand Down
Loading