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.

Sign up for GitHub

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

Jump to bottom

[DDW-675] Fix broken Storybook #1402

Merged
merged 4 commits into from May 23, 2019
Merged

[DDW-675] Fix broken Storybook #1402

merged 4 commits into from May 23, 2019

Conversation

nikolaglumac
Copy link
Contributor

@nikolaglumac nikolaglumac commented May 23, 2019 •
edited

This PR fixes Storybook issues:

  • Removes nodejs stuff from rendering process
  • Updates storybook package

NOTE:
This PR breaks the stateDirectoryPath functionality on Network status dialog.
It will be restored in the scope of a separate task: https://iohk.myjetbrains.com/youtrack/issue/DDW-676

Testing Checklist

Review Checklist

Basics

  • PR has been assigned and has appropriate labels (feature/bug/chore, release-x.x.x)
  • PR is updated to the most recent version of the target branch (and there are no conflicts)
  • PR has a good description that summarizes all changes and shows some screenshots or animated GIFs of important UI changes
  • CHANGELOG entry has been added to the top of the appropriate section (Features, Fixes, Chores) and is linked to the correct PR on GitHub
  • Automated tests: All acceptance and unit tests are passing (yarn test)
  • Manual tests (minimum tests should cover newly added feature/fix): App works correctly in development build (yarn dev)
  • Manual tests (minimum tests should cover newly added feature/fix): App works correctly in production build (yarn package / CI builds)
  • There are no flow errors or warnings (yarn flow:test)
  • There are no lint errors or warnings (yarn lint)
  • There are no prettier errors or warnings (yarn prettier:check)
  • There are no missing translations (running yarn manage:translations produces no changes)
  • Text changes are proofread and approved (Jane Wild / Amy Reeve)
  • Japanese text changes are proofread and approved (Junko Oda)
  • UI changes look good in all themes (Alexander Rukin)
  • Storybook works and no stories are broken (yarn storybook)
  • In case of dependency changes yarn.lock file is updated

Code Quality

  • Important parts of the code are properly commented and documented
  • Code is properly typed with flow
  • React components are split-up enough to avoid unnecessary re-renderings
  • Any code that only works in main process is neatly separated from components

Testing

  • New feature/change is covered by acceptance tests
  • New feature/change is manually tested and approved by QA team
  • All existing acceptance tests are still up-to-date
  • New feature/change is covered by Daedalus Testing scenario
  • All existing Daedalus Testing scenarios are still up-to-date

After Review

  • Merge the PR
  • Delete the source branch
  • Move the ticket to done column on the YouTrack board
  • Update Slack QA thread by marking it with a green checkmark

@nikolaglumac nikolaglumac removed the WIP label May 23, 2019
@nikolaglumac nikolaglumac requested a review from a team May 23, 2019 12:22
nikolaglumac
nikolaglumac commented May 23, 2019
View reviewed changes
source/main/environment.js
@@ -2,7 +2,7 @@
import os from 'os';
import { uniq, upperFirst, get, includes } from 'lodash';
import { version } from '../../package.json';
import { stateDirectoryPath } from './config';
// import { stateDirectoryPath } from './config';
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@DeeJayElly we can not use anything from ./config as this breaks the storybook.
The problem is that within ./config we use fs to load the LauncherConfig which contains all the paths we need (incl. the state path).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This import should be removed and we should send the state path to the renderer process through the IPC channel. Similar to how we do for the system locale: https://github.com/input-output-hk/daedalus/blob/develop/source/main/index.js#L142
Network status store should receive this value on app start time and then propagate it to the Network status container and component.

nikolaglumac
nikolaglumac commented May 23, 2019
View reviewed changes
source/main/environment.js
@@ -82,7 +82,7 @@ export const environment: Environment = Object.assign(
isWindows,
isMacOS,
isLinux,
stateDirectoryPath,
stateDirectoryPath: '',
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@DeeJayElly I have on purpose used an empty string for the value of state directory. It should be fixed in the scope of this task: https://iohk.myjetbrains.com/youtrack/issue/DDW-676

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The stateDirectoryPath property should be removed from the environment.js.

@nikolaglumac nikolaglumac changed the title [DDW-675] Update storybook, Remove nodejs from rendering process [DDW-675] Fix broken Storybook May 23, 2019
tomislavhoracek
tomislavhoracek approved these changes May 23, 2019
View reviewed changes
Copy link
Contributor

@tomislavhoracek tomislavhoracek left a comment

Choose a reason for hiding this comment

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

Nice work 👍

@nikolaglumac nikolaglumac merged commit 7e931d8 into develop May 23, 2019
@iohk-bors iohk-bors bot deleted the fix/ddw-675-fix-broken-storybook branch May 23, 2019 12:50
@nikolaglumac nikolaglumac mentioned this pull request Jul 15, 2019
Merged
@darko-mijic darko-mijic mentioned this pull request Jul 30, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tomislavhoracek tomislavhoracek tomislavhoracek approved these changes

Assignees

@nikolaglumac nikolaglumac

Labels
bug release-0.14.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@nikolaglumac @tomislavhoracek @DeeJayElly