LBRYCommunity/spee.ch
1
0
Fork 0
Code Issues 95 Pull requests 2 Projects Releases 4 Packages Wiki Activity

allow claims to be updated and abandoned #595

Merged
daovist merged 46 commits from update-claims into master 2018-11-09 16:50:34 +01:00
Conversation 2 Commits 46 Files changed 60 +1080 -280
daovist commented 2018-09-06 17:20:56 +02:00 (Migrated from github.com)
Copy link

#482
#554

#482 #554
skhameneh (Migrated from github.com) requested changes 2018-09-24 19:54:11 +02:00
skhameneh (Migrated from github.com) left a comment
Copy link

Nothing too major

Nothing too major
client/src/containers/PublishDetails/index.js
skhameneh (Migrated from github.com) commented 2018-09-24 19:40:21 +02:00
Copy link

You've repeated this code a few times for getting the asset, I'd suggest creating a util method

You've repeated this code a few times for getting the `asset`, I'd suggest creating a util method
client/src/pages/EditPage/index.js
skhameneh (Migrated from github.com) commented 2018-09-24 19:41:04 +02:00
Copy link

See above comment about adding a util

See above comment about adding a util
client/src/reducers/show.js
skhameneh (Migrated from github.com) commented 2018-09-24 19:43:43 +02:00
Copy link

Please use spread operators to clean this up.

e.g.:

{
  ...state,
  assetList: newAssetList,
  channelList: {
    ...state.channelList,
    [channelId]: {}
  }
}
Please use spread operators to clean this up. e.g.: ``` { ...state, assetList: newAssetList, channelList: { ...state.channelList, [channelId]: {} } } ```
skhameneh (Migrated from github.com) commented 2018-09-24 19:44:05 +02:00
Copy link

Same as above, use spread operators

Same as above, use spread operators
client/src/sagas/abandon.js
skhameneh (Migrated from github.com) commented 2018-09-24 19:44:39 +02:00
Copy link

Should use consistent formatting (I know, the existing code is inconsistent)

Should use consistent formatting (I know, the existing code is inconsistent)
client/src/sagas/abandon.js
@ -0,0 +9,4 @@
const { claimData, history } = action.data;
const { claimId } = claimData;
const confirm = window.confirm('Are you sure you want to abandon this claim? This action cannot be undone.');
skhameneh (Migrated from github.com) commented 2018-09-24 19:46:17 +02:00
Copy link

This works for now, but we should have some common prompt to match Spee.ch.

This works for now, but we should have some common prompt to match Spee.ch.
client/src/sagas/publish.js
skhameneh (Migrated from github.com) commented 2018-09-24 19:47:56 +02:00
Copy link

This logic exists in both conditions, can you move it out?

This logic exists in both conditions, can you move it out?
skhameneh (Migrated from github.com) commented 2018-09-24 19:48:28 +02:00
Copy link

Can move this out as publishChannel = yield call(makePublishRequestChannel, publishFormData, isUpdate);

Can move this out as `publishChannel = yield call(makePublishRequestChannel, publishFormData, isUpdate);`
server/controllers/api/claim/update/updatePublishParams.js
skhameneh (Migrated from github.com) commented 2018-09-24 19:53:31 +02:00
Copy link

You have this validation in more than one place, please combine

You have this validation in more than one place, please combine
kauffj (Migrated from github.com) reviewed 2018-09-25 15:46:45 +02:00
kauffj (Migrated from github.com) left a comment
Copy link

Looks good overall

Looks good overall
client/src/actions/publish.js
@ -14,6 +14,19 @@ export function clearFile () {
};
}
export function setUpdateTrue () {
kauffj (Migrated from github.com) commented 2018-09-25 15:25:52 +02:00
Copy link

Is this necessary? My inclination is that there must be another state value corresponding to what is being edited (or even however you ended up on the edit page) that should allow you to know this without an additional explicit value.

Is this necessary? My inclination is that there must be another state value corresponding to what is being edited (or even however you ended up on the edit page) that should allow you to know this without an additional explicit value.
client/src/api/assetApi.js
@ -42,3 +42,15 @@ export function getClaimViews (claimId) {
const url = `/api/claim/views/${claimId}`;
return Request(url);
}
kauffj (Migrated from github.com) commented 2018-09-25 15:27:36 +02:00
Copy link

DRY

DRY
client/src/channels/publish.js
@ -6,3 +5,4 @@
const uri = `/api/claim/${isUpdate ? 'update' : 'publish'}`;
const xhr = new XMLHttpRequest();
// add event listeners
const onLoadStart = () => {
kauffj (Migrated from github.com) commented 2018-09-25 15:29:20 +02:00
Copy link

I know you didn't add this, but you should know we can just use the Fetch API.

I know you didn't add this, but you should know we can just use the Fetch API.
client/src/constants/publish_claim_states.js
@ -1,5 +1,6 @@
export const LOAD_START = 'LOAD_START';
export const LOADING = 'LOADING';
kauffj (Migrated from github.com) commented 2018-09-25 15:29:53 +02:00
Copy link

should be SUCCEEDED fwiw

should be `SUCCEEDED` fwiw
client/src/containers/AssetDisplay/view.jsx
kauffj (Migrated from github.com) commented 2018-09-25 15:31:52 +02:00
Copy link

if this isn't being fixed before shipping, it needs to be filed, and it's a good practice to link the issue as an inline comment

if this isn't being fixed before shipping, it needs to be filed, and it's a good practice to link the issue as an inline comment
client/src/containers/AssetDisplay/view.jsx
@ -4,1 +4,4 @@
import { LOCAL_CHECK, UNAVAILABLE, ERROR, AVAILABLE } from '../../constants/asset_display_states';
import createCanonicalLink from '../../../../utils/createCanonicalLink';
class AvailableContent extends React.Component {
kauffj (Migrated from github.com) commented 2018-09-25 15:30:44 +02:00
Copy link

good refactor!

good refactor!
client/src/containers/AssetTitle/view.jsx
kauffj (Migrated from github.com) commented 2018-09-25 15:32:51 +02:00
Copy link

better to have this out of the h3 ("edit" isn't part of the title for SEO / accessibility purposes, etc.)

better to have this out of the h3 ("edit" isn't part of the title for SEO / accessibility purposes, etc.)
client/src/pages/EditPage/view.jsx
@ -0,0 +27,4 @@
asset.claimsData.channelName !== myChannel
)
) {
return (<Redirect to={'/'} />);
kauffj (Migrated from github.com) commented 2018-09-25 15:36:18 +02:00
Copy link

Do we need to redirect to login? Show an error? How would this happen to a user genuinely?

(one guess: sign in in one tab, then sign in a second tab, and click edit from the first tab)

Do we need to redirect to login? Show an error? How would this happen to a user genuinely? (one guess: sign in in one tab, then sign in a second tab, and click edit from the first tab)
client/src/pages/HomePage/view.jsx
@ -14,4 +10,1 @@
}
}
render () {
kauffj (Migrated from github.com) commented 2018-09-25 15:37:51 +02:00
Copy link

Why does this have to happen here? Does this have to happen for any component that includes <PublishTool />? If so, this should be avoided.

Why does this have to happen here? Does this have to happen for any component that includes `<PublishTool />`? If so, this should be avoided.
server/controllers/api/claim/abandon/index.js
@ -0,0 +8,4 @@
route to abandon a claim through the daemon
*/
const claimAbandon = async (req, res) => {
kauffj (Migrated from github.com) commented 2018-09-25 15:42:51 +02:00
Copy link

This function looks great! Looking forward to more like this

This function looks great! Looking forward to more like this
server/controllers/api/claim/publish/publish.js
kauffj (Migrated from github.com) commented 2018-09-25 15:44:16 +02:00
Copy link

Do these need to be in a transaction if they need to both execute atomically?

Do these need to be in a transaction if they need to both execute atomically?
server/controllers/api/claim/update/index.js
kauffj (Migrated from github.com) commented 2018-09-25 15:45:39 +02:00
Copy link

Can be filed, but this is a rather important value that ought to be hoisted all the way to a site-specific config

Can be filed, but this is a rather important value that ought to be hoisted all the way to a site-specific config
daovist (Migrated from github.com) reviewed 2018-09-25 19:44:01 +02:00
client/src/actions/publish.js
@ -14,6 +14,19 @@ export function clearFile () {
};
}
export function setUpdateTrue () {
daovist (Migrated from github.com) commented 2018-09-25 19:44:01 +02:00
Copy link

I think it would be more complex to do this another way e.g. looking at the router path

I think it would be more complex to do this another way e.g. looking at the router path
daovist (Migrated from github.com) reviewed 2018-09-25 19:44:15 +02:00
client/src/pages/EditPage/view.jsx
@ -0,0 +27,4 @@
asset.claimsData.channelName !== myChannel
)
) {
return (<Redirect to={'/'} />);
daovist (Migrated from github.com) commented 2018-09-25 19:44:15 +02:00
Copy link

I was only considering a nefarious user. I don't think this matters much; just needs to not render the edit page.

I was only considering a nefarious user. I don't think this matters much; just needs to not render the edit page.
daovist (Migrated from github.com) reviewed 2018-09-26 18:08:01 +02:00
client/src/pages/HomePage/view.jsx
@ -14,4 +10,1 @@
}
}
render () {
daovist (Migrated from github.com) commented 2018-09-26 18:08:00 +02:00
Copy link

Nice catch/good point! Current speech only clears the file for file errors, reset, publish success, and cancel publish, so two features using the same state.publish were stepping on each others toes

My new approach uses isUpdate

When the publish page mounts: if isUpdate then clearFile

When edit page mounts: if !isUpdate then clearFile, setUpdateTrue, setMetadata

This way a user can start a publish or update, leave the page, and come back to where they were, like current speech, unless they go to the other (Edit/Publish) page, in which case it starts fresh with publish or update

code

Nice catch/good point! Current speech only clears the file for file errors, reset, publish success, and cancel publish, so two features using the same `state.publish` were stepping on each others toes My new approach uses `isUpdate` When the publish page mounts: if `isUpdate` then `clearFile` When edit page mounts: if `!isUpdate` then `clearFile, setUpdateTrue, setMetadata` This way a user can start a publish or update, leave the page, and come back to where they were, like current speech, unless they go to the other (Edit/Publish) page, in which case it starts fresh with publish or update [code](https://github.com/lbryio/spee.ch/pull/595/commits/7c4323ba648fea1e8e2b361a17654b10ae66ff93)
kauffj (Migrated from github.com) reviewed 2018-09-26 20:19:01 +02:00
client/src/pages/HomePage/view.jsx
@ -14,4 +10,1 @@
}
}
render () {
kauffj (Migrated from github.com) commented 2018-09-26 20:19:01 +02:00
Copy link

👍

:+1:
daovist (Migrated from github.com) reviewed 2018-09-26 21:15:40 +02:00
server/controllers/api/claim/update/index.js
daovist (Migrated from github.com) commented 2018-09-26 21:15:40 +02:00
Copy link

#609

#609
skhameneh commented 2018-10-26 18:53:18 +02:00 (Migrated from github.com)
Copy link

Is this ready to test or are we waiting on more daemon changes?

Is this ready to test or are we waiting on more daemon changes?
daovist commented 2018-10-26 19:23:38 +02:00 (Migrated from github.com)
Copy link

the daemon is good now but I still have a few more things to address, I'll let you know

the daemon is good now but I still have a few more things to address, I'll let you know
skhameneh (Migrated from github.com) approved these changes 2018-11-08 22:56:06 +01:00
client/src/containers/Dropzone/index.js
skhameneh (Migrated from github.com) commented 2018-11-08 22:46:52 +01:00
Copy link

store asset.claimData in a local var since it's use many times

store `asset.claimData` in a local var since it's use many times
client/src/containers/Dropzone/view.jsx
@ -129,2 +146,2 @@
)}
</div>
</div>
)}
skhameneh (Migrated from github.com) commented 2018-11-08 22:49:27 +01:00
Copy link

Can use spread operator for switching props, e.g.:

<Elem ...(showSmall ? { small: true } : { small: false }) />
Can use spread operator for switching props, e.g.: ``` <Elem ...(showSmall ? { small: true } : { small: false }) /> ```
server/chainquery/bundle.js
skhameneh (Migrated from github.com) commented 2018-11-08 22:52:38 +01:00
Copy link

Should we order these?

Should we order these?
server/controllers/api/claim/abandon/index.js
skhameneh (Migrated from github.com) commented 2018-11-08 22:53:32 +01:00
Copy link

use the aliases

use the aliases
skhameneh (Migrated from github.com) commented 2018-11-08 22:53:41 +01:00
Copy link

use aliases

use aliases
server/controllers/api/claim/publish/index.js
@ -18,2 +18,4 @@
const authenticateUser = require('./authentication.js');
const chainquery = require('chainquery');
const createCanonicalLink = require('../../../../../utils/createCanonicalLink');
skhameneh (Migrated from github.com) commented 2018-11-08 22:53:56 +01:00
Copy link

Use aliases

Use aliases
server/controllers/api/claim/update/index.js
skhameneh (Migrated from github.com) commented 2018-11-08 22:55:00 +01:00
Copy link

Use aliases

Use aliases
server/utils/fetchClaimData.js
skhameneh (Migrated from github.com) commented 2018-11-08 22:55:56 +01:00
Copy link

I'd much prefer to avoid single line if logic, I find it reduced legibility.

I'd much prefer to avoid single line `if` logic, I find it reduced legibility.
daovist (Migrated from github.com) reviewed 2018-11-09 15:52:02 +01:00
server/chainquery/bundle.js
daovist (Migrated from github.com) commented 2018-11-09 15:52:02 +01:00
Copy link

This is for a single claim. I need to do a lookup by channel_id. This can be more generalized in the near future.

This is for a single claim. I need to do a lookup by channel_id. This can be more generalized in the near future.
Sign in to join this conversation.
Reviewers
No reviewers
skhameneh
Labels
Clear labels   
area: devops

   
area: discovery

   
area: docs

   
area: livestream

   
area: proposal

Work is part of a proposal

  
consider soon

Discuss this issue at the next planning meeting, then remove this label

  
dependencies

Pull requests that update a dependency file

  
Epic

   
good first issue

   
hacktoberfest

Welcome to Hacktoberfest

  
help wanted

   
icebox

Long-term storage

  
level: 1

No knowledge of the existing code required

  
level: 2

Some knowledge of the existing code is recommended

  
level: 3

Significant knowledge of the existing code is recommended

  
level: 4

Intimate knowledge of the existing code is recommended

  
needs: exploration

Solution unclear, needs research

  
needs: grooming

Issue needs to be groomed before work can start

  
needs: priority

Priority level needs to be defined

  
needs: repro

Issue needs step-by-step instructions on how to reproduce in latest code

  
needs: tech design

Needs technical design signoff before implementation can begin

  
on hold

Temporarily paused

  
Osprey

Spee.ch special project

  
priority: blocker

Issue is blocking release, do ASAP

  
priority: high

Work needs to be moved into sprint ASAP

  
priority: low

Work should be done but can stay in the backlog for now

  
priority: medium

Work needs to be done within 2-3 sprints

  
protocol dependent

   
resilience

   
Tom's Wishlist

   
type: bug

Existing functionality is wrong or broken

  
type: discussion

A conversation. No specific changes requested

  
type: error handling

   
type: improvement

Existing (or partially existing) functionality needs to be changed

  
type: new feature

New functionality that does not exist yet

  
type: refactor

Minimal user-visible changes, but significant internal work

  
type: task

Either work that's not related to the code, or a small chore that does not fit into other categories

  
type: testing

Solution needs additional user testing

  
unplanned

Work that was not planned into the spirnt, took priority over planned work

No labels
area: devops
area: discovery
area: docs
area: livestream
area: proposal
consider soon
dependencies
Epic
good first issue
hacktoberfest
help wanted
icebox
level: 1
level: 2
level: 3
level: 4
needs: exploration
needs: grooming
needs: priority
needs: repro
needs: tech design
on hold
Osprey
priority: blocker
priority: high
priority: low
priority: medium
protocol dependent
resilience
Tom's Wishlist
type: bug
type: discussion
type: error handling
type: improvement
type: new feature
type: refactor
type: task
type: testing
unplanned
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: LBRYCommunity/spee.ch#595
No description provided.
Delete branch "update-claims"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?