oceanprotocol/commons
1
0
Fork 0
mirror of https://github.com/oceanprotocol/commons.git synced 2023-03-15 18:03:00 +01:00
Code Releases Activity

test fixes

Browse Source
This commit is contained in:
mihaisc 2020-05-19 14:21:34 +03:00
parent aff63caf9a
commit 55bf9f314f
9 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/components/atoms/Account.module.scss
View File

@ -47,7 +47,7 @@
display: inline-block;
fill: currentColor;
margin-right: $spacer / 8;
transition: 0.2s ease-out;
transition: .2s ease-out;
}
}

4
client/src/components/atoms/CategoryImage.module.scss
View File

@ -15,7 +15,7 @@
.header {
// stylelint-disable value-keyword-case
composes: categoryImage;
composes: categoryimage;
// stylelint-enable value-keyword-case
height: 8rem;
margin-top: $spacer / $line-height;
@ -23,7 +23,7 @@
.dimmed {
// stylelint-disable value-keyword-case
composes: categoryImage;
composes: categoryimage;
// stylelint-enable value-keyword-case
opacity: .6;
}

12
client/src/components/atoms/Form/Input.module.scss
View File

@ -33,8 +33,8 @@
width: 1.25rem;
height: 1.25rem;
top: 50%;
margin-top: -0.6rem;
fill: rgba($brand-grey-light, 0.7);
margin-top: -.6rem;
fill: rgba($brand-grey-light, .7);
}
}
@ -50,7 +50,7 @@
padding: $spacer / 3;
margin: 0;
border-radius: $border-radius;
transition: 0.2s ease-out;
transition: .2s ease-out;
min-height: 43px;
appearance: none;
@ -65,8 +65,8 @@
font-size: $font-size-base;
color: $brand-grey-light;
font-weight: $font-weight-base;
transition: 0.2s ease-out;
opacity: 0.7;
transition: .2s ease-out;
opacity: .7;
}
&[readonly],
@ -155,7 +155,7 @@
font-size: $font-size-small;
line-height: 1.2;
border: 2px solid $brand-grey-lighter;
border-radius: 0.2rem;
border-radius: .2rem;
position: absolute;
left: 0;
right: 0;

4
client/src/components/molecules/AccountStatus/Indicator.module.scss
View File

@ -18,7 +18,7 @@
/* yellow triangle */
.statusIndicatorCloseEnough {
// stylelint-disable value-keyword-case
composes: statusIndicator;
composes: statusindicator;
// stylelint-enable value-keyword-case
background: none;
width: 0;
@ -31,7 +31,7 @@
/* green circle */
.statusIndicatorActive {
// stylelint-disable value-keyword-case
composes: statusIndicator;
composes: statusindicator;
// stylelint-enable value-keyword-case
border-radius: 50%;
background: $green;

10
client/src/components/molecules/AccountStatus/Popover.module.scss
View File

@ -7,12 +7,12 @@ $popoverWidth: 18rem;
width: $popoverWidth;
padding: $spacer / 2;
background: $brand-black;
border-radius: 0.1rem;
border: 0.1rem solid $brand-grey-light;
box-shadow: 0 6px 16px 0 rgba($brand-black, 0.3);
border-radius: .1rem;
border: .1rem solid $brand-grey-light;
box-shadow: 0 6px 16px 0 rgba($brand-black, .3);
color: $brand-grey-light;
font-size: $font-size-small;
animation: showPopup 0.2s ease-in forwards;
animation: showPopup .2s ease-in forwards;
white-space: initial;
text-align: left;
}
@ -28,7 +28,7 @@ $popoverWidth: 18rem;
}
.popoverInfoline {
border-bottom: 0.05rem solid $brand-grey;
border-bottom: .05rem solid $brand-grey;
padding: $spacer / 3 0;
&:first-child {

6
client/src/components/molecules/JobTeaser.tsx
View File

@ -3,6 +3,7 @@ import { User } from '../../context'
import moment from 'moment'
import styles from './JobTeaser.module.scss'
import Dotdotdot from 'react-dotdotdot'
import shortid from 'shortid'
export default function JobTeaser({ job }: { job: any }) {
const { ocean } = useContext(User)
@ -54,7 +55,10 @@ export default function JobTeaser({ job }: { job: any }) {
<>
<div>Output URL</div>
{job.resultsUrl.map((result: string) => (
<a href={result}> {result.substring(0, 52)}...</a>
<a href={result} key={shortid.generate()}>
{' '}
{result.substring(0, 52)}...
</a>
))}
</>
) : (

2
client/src/components/organisms/WalletSelector.module.scss
View File

@ -24,7 +24,7 @@
align-items: flex-start;
text-align: left;
cursor: pointer;
transition: border 0.2s ease-out;
transition: border .2s ease-out;
margin-bottom: $spacer;
position: relative;

2
client/src/components/templates/Asset/AssetJob.tsx
View File

@ -153,7 +153,7 @@ export default function AssetsJobs({ ddo, ocean }: JobsProps) {
{isPublished ? (
<div className={styles.success}>
<p>Your job started!</p>
<Button link to={'/history/'}>
<Button link to="/history/">
Watch the progress in the history page.
</Button>
</div>

70
client/src/utils/getUserJobs.ts
View File

@ -1,47 +1,43 @@
const tempList =
[{
"agreementId": "a40d4fbddf7c45fb988b3f47e7fb8d50386ee8c968c94a0db6909cd96582e6cd",
"algorithmLogUrl": null,
"dateCreated": 1585581794.73346,
"dateFinished": null,
"jobId": "5e67cdffc2224907b10cdb802820033ee",
"owner": "0x4D156A2ef69ffdDC55838176C6712C90f60a2285",
"removed": 0,
"resultsDid": "",
"resultsUrl": "",
"status": 10,
"statusText": "Job started",
"stopreq": 0
const tempList = [
{
agreementId:
'a40d4fbddf7c45fb988b3f47e7fb8d50386ee8c968c94a0db6909cd96582e6cd',
algorithmLogUrl: null,
dateCreated: 1585581794.73346,
dateFinished: null,
jobId: '5e67cdffc2224907b10cdb802820033ee',
owner: '0x4D156A2ef69ffdDC55838176C6712C90f60a2285',
removed: 0,
resultsDid: '',
resultsUrl: '',
status: 10,
statusText: 'Job started',
stopreq: 0
},
{
"agreementId": "a40d4fbddf7c45fb988b3f47e7fb8d50386ee8c968c94a0db6909cd96582e6cd",
"algorithmLogUrl": null,
"dateCreated": 1585581794.73346,
"dateFinished": null,
"jobId": "5e67cdffc2224907b10cdb80820033ee",
"owner": "0x4D156A2ef69ffdDC55838176C6712C90f60a2285",
"removed": 0,
"resultsDid": "",
"resultsUrl": "",
"status": 10,
"statusText": "Job started",
"stopreq": 0
agreementId:
'a40d4fbddf7c45fb988b3f47e7fb8d50386ee8c968c94a0db6909cd96582e6cd',
algorithmLogUrl: null,
dateCreated: 1585581794.73346,
dateFinished: null,
jobId: '5e67cdffc2224907b10cdb80820033ee',
owner: '0x4D156A2ef69ffdDC55838176C6712C90f60a2285',
removed: 0,
resultsDid: '',
resultsUrl: '',
status: 10,
statusText: 'Job started',
stopreq: 0
}
]
]
export async function getUserJobs(ocean: any, account: string) {
try {
const accounts = await ocean.accounts.list()
//const jobList = await ocean.compute.status(account)
// const jobList = await ocean.compute.status(accounts[0])
return tempList;
// const jobList = await ocean.compute.status(account)
// const jobList = await ocean.compute.status(accounts[0])
return tempList
} catch (error) {
console.error(error.message)
}
}
}