Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jordan/2188 page network bug #2214

Merged
merged 14 commits into from
Mar 13, 2019
Merged

Jordan/2188 page network bug #2214

merged 14 commits into from
Mar 13, 2019

Conversation

jbibla
Copy link
Collaborator

@jbibla jbibla commented Mar 7, 2019

Closes #2188

Description:

  • using TmPage loading, loaded, dataset props
  • updated Connecting Msg copy
  • added blocks.loaded to module

Thank you! 🚀


For contributor:

  • Added entries in PENDING.md with issue # and GitHub username
  • Reviewed Files changed in the github PR explorer
  • Attach screenshots of the UI components on the PR description (if applicable)
  • Scope of work approved for big PRs

For reviewer:

  • Manually tested the changes on the UI

@@ -87,7 +87,7 @@ export default {
default: undefined
},
dataset: {
type: Array,
type: [Array, Object],
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i know we agreed to not permit this. however, this might be time for an exception or please share a suggestion for how to avoid this.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this needs to be an array or more then this needs to be refactored. see line 28

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

proposal: change to "dataAvailable" and make it a boolean. checks are then performed on each page on the individual dataset

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also cheaper to pass

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok makes sense. do you guys think this should be done in this PR and not separately?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let's do it in here. the change needs to happen in only 3 places and we don't pile up more dept.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in only 3 places

yeah. one line 😝

:loading="blocks.loading"
:loaded="blocks.loaded"
:error="blocks.error"
:dataset="lastHeader"
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

page network is a bit strange because it doesn't need the "items" (dataset) to load. it just needs a connection to render the top part of the page. the blocks are the second "dataset". lastHeader and connection don't have loading, loaded, or error states...

reveals room for a refactor - but this might be sufficient for now.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we have in the store the list of blocks, but I like more @faboweb idea of booleanize

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

me too

@codecov
Copy link

codecov bot commented Mar 7, 2019

Codecov Report

❗ No coverage uploaded for pull request base (develop@f822491). Click here to learn what that means.
The diff coverage is 50%.

@@            Coverage Diff             @@
##             develop    #2214   +/-   ##
==========================================
  Coverage           ?   95.34%           
==========================================
  Files              ?      108           
  Lines              ?     2279           
  Branches           ?      114           
==========================================
  Hits               ?     2173           
  Misses             ?       93           
  Partials           ?       13
Impacted Files Coverage Δ
...pp/src/renderer/components/network/PageNetwork.vue 100% <ø> (ø)
app/src/renderer/components/common/TmPage.vue 100% <ø> (ø)
app/src/renderer/vuex/modules/blocks.js 98.3% <50%> (ø)

@codecov
Copy link

codecov bot commented Mar 7, 2019

Codecov Report

Merging #2214 into develop will decrease coverage by <.01%.
The diff coverage is 100%.

@@             Coverage Diff             @@
##           develop    #2214      +/-   ##
===========================================
- Coverage    96.63%   96.62%   -0.01%     
===========================================
  Files          109      108       -1     
  Lines         2316     2314       -2     
  Branches       116      116              
===========================================
- Hits          2238     2236       -2     
  Misses          65       65              
  Partials        13       13
Impacted Files Coverage Δ
app/src/renderer/components/common/TmPage.vue 100% <ø> (ø) ⬆️
...pp/src/renderer/components/network/PageNetwork.vue 100% <ø> (ø) ⬆️
.../renderer/components/governance/PageGovernance.vue 100% <ø> (ø) ⬆️
app/src/renderer/components/wallet/PageWallet.vue 96.29% <100%> (ø) ⬆️
...rc/renderer/components/wallet/PageTransactions.vue 100% <100%> (ø) ⬆️
...ponents/transactions/LiDistributionTransaction.vue 85.71% <0%> (ø) ⬆️

@sabau
Copy link
Contributor

sabau commented Mar 11, 2019

I think this should be merged right after TmPage and PageNetwork stuff is done, all good and and is a bug fix

faboweb
faboweb previously approved these changes Mar 12, 2019
faboweb
faboweb previously approved these changes Mar 12, 2019
PENDING.md Outdated Show resolved Hide resolved
class="governance"
data-title="Governance"
>
<tm-page :tabs="tabs" class="governance" data-title="Governance">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't we cover the case when we have no proposals with the new Boolean dataEmpty?

Copy link
Collaborator Author

@jbibla jbibla Mar 12, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, we do. but currently the logic for this is in TabProposals, not PageGov. Our page structure is a bit funny. But this is not needed here, now.

#2237 #2060

faboweb
faboweb previously approved these changes Mar 13, 2019
sabau
sabau previously approved these changes Mar 13, 2019
Copy link
Contributor

@sabau sabau left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's true TmPage with tabs hide some logic

sabau
sabau previously approved these changes Mar 13, 2019
Copy link
Contributor

@sabau sabau left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let's fix the network

@faboweb faboweb merged commit f05bf1a into develop Mar 13, 2019
@faboweb faboweb deleted the jordan/2188-page-network-bug branch March 13, 2019 11:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants