Remove Pinning and add Add By Path by hacdias · Pull Request #655 · ipfs/ipfs-desktop

hacdias · 2018-08-28T15:44:33Z

Closes #652

License: MIT Signed-off-by: Henrique Dias <hacdias@gmail.com>

lidel

Works as expected, ok to merge after some minor polish:

Dialog window is missing "OK" button
Add from disk and Add fro Path look the same:

We will redesign this anyway, so maybe for now just add titles that show up on mouse hover.
- inline comments below

lidel · 2018-09-04T09:22:23Z

src/controls/main/pinned-files.js

+  try {
+    await ipfs().files.stat(PATH)
+  } catch (_) {
+    return


Return silently only if error is Error: file does not exist.
Everything else should be logged.

lidel · 2018-09-04T09:23:26Z

src/controls/main/pinned-files.js

-  const sendPinning = () => { send('pinning', pinning > 0) }
-  const inc = () => { pinning++; sendPinning() }
-  const dec = () => { pinning--; sendPinning() }
+  await ipfs().files.mkdir('/pinset_from_old_ipfs')


+desktop: pinset_from_old_ipfs_desktop

lidel · 2018-09-04T14:15:24Z

src/controls/main/files.js

+  const { ipfs } = opts
+
+  return async (_, hash, path) => {
+    if (!hash.startsWith('/ipfs')) {


People may try to add /ipns/ paths, and that should not be prefixed.

License: MIT Signed-off-by: Henrique Dias <hacdias@gmail.com>

hacdias · 2018-09-04T16:42:05Z

@lidel I changed the icon to the pinning one just to make it more familiar for now. What do you think?

lidel

Better, but still need those titles :P

lidel · 2018-09-04T16:52:26Z

src/panes/Files.js

+
+    const path = await prompt({
+      title: 'Add by IPFS Path',
+      label: 'How do you want to tag it?',


Now that we are in Files "How do you want to name it?" is a better label.

lidel · 2018-09-04T16:53:40Z

src/panes/Files.js

+
+    const hash = await prompt({
+      title: 'Add by IPFS Path',
+      label: 'Write the IPFS path to add:',


"Enter the IPFS path to add:"

lidel · 2018-09-04T16:57:22Z

src/panes/Files.js

            <IconButton active={this.state.sticky} onClick={this.toggleStickWindow} icon='eye' />

            <div className='right'>
+              <IconButton onClick={this.addFromIPFS} icon='pin-alt' />


IconButton should accept title as one of its props, and use it like this:

<button title="Add by IPFS Path">[icon]</button>

We really need a tooltip that describes what the button does :)

License: MIT Signed-off-by: Henrique Dias <hacdias@gmail.com>

hacdias · 2018-09-04T21:05:35Z

Done @lidel 😄

lidel

Thanks! I feel this should be enough for now, we don't want to spend too much time on this.
When WebUI lands we will get back to Desktop with proper redesign :) 👍

Before merging this, check logging bug below 🙃

lidel · 2018-09-04T22:55:23Z

src/controls/main/pinned-files.js

+  try {
+    await ipfs().files.stat(PATH)
+  } catch (e) {
+    if (e.toString().indexOf('file does not exist') !== -1) {


I think you meant === here :) Avoid indexOf, try using String.includes instead, it is easier to read and harder to make a mistake.

In this particular case, this should be enough:

if (e.message !== 'file does not exist') {

Thanks! Merging now 😄

License: MIT Signed-off-by: Henrique Dias <hacdias@gmail.com>

lidel · 2018-09-05T09:36:46Z

@hacdias would be good to make a new release with this fix.
New users would not need to see migrated pinset when new WebUI lands :)

hacdias · 2018-09-05T09:42:50Z

@lidel I'd like to but Jenkins isn't building for Windows and there seems to be an issue with macOS I can't replicate (#656)... Doesn't seem to be a good time for release 😞

hacdias added 3 commits August 28, 2018 14:57

feat: migrate pins

aa6a4af

License: MIT Signed-off-by: Henrique Dias <hacdias@gmail.com>

hide menu on welcome screen

25e0ef8

License: MIT Signed-off-by: Henrique Dias <hacdias@gmail.com>

add by path functionality

0e768a3

License: MIT Signed-off-by: Henrique Dias <hacdias@gmail.com>

hacdias changed the title ~~[wip] Remove Pinning and add Add By Path~~ Remove Pinning and add Add By Path Sep 4, 2018

hacdias requested review from fsdiogo, lidel and olizilla September 4, 2018 08:50

lidel requested changes Sep 4, 2018

View reviewed changes

hacdias added 6 commits September 4, 2018 16:12

fix: pin folder path

7544de3

License: MIT Signed-off-by: Henrique Dias <hacdias@gmail.com>

dont prefix ipns

e3c44fe

License: MIT Signed-off-by: Henrique Dias <hacdias@gmail.com>

dont prefix ipns again

f6b502f

License: MIT Signed-off-by: Henrique Dias <hacdias@gmail.com>

log error

f95bbf7

License: MIT Signed-off-by: Henrique Dias <hacdias@gmail.com>

add ok button to message

f2cde03

License: MIT Signed-off-by: Henrique Dias <hacdias@gmail.com>

change icon

64d5101

License: MIT Signed-off-by: Henrique Dias <hacdias@gmail.com>

hacdias closed this Sep 4, 2018

hacdias reopened this Sep 4, 2018

lidel requested changes Sep 4, 2018

View reviewed changes

title on buttons & better messages

415623e

License: MIT Signed-off-by: Henrique Dias <hacdias@gmail.com>

lidel approved these changes Sep 4, 2018

View reviewed changes

use includes instead of indexOf

0d5cde6

License: MIT Signed-off-by: Henrique Dias <hacdias@gmail.com>

hacdias merged commit bde02e4 into master Sep 5, 2018

hacdias deleted the remove-pinning branch September 5, 2018 07:49

Kirobi92 mentioned this pull request Jun 23, 2023

[Snyk] Fix for 1 vulnerabilities Kirobi92/ipfs-desktop#68

Open

0racl3z mentioned this pull request Jun 23, 2023

[Snyk] Fix for 1 vulnerabilities 0racl3z/ipfs-desktop#12

Open

thexdesk mentioned this pull request Jun 24, 2023

[Snyk] Fix for 1 vulnerabilities thexdesk/ipfs-desktop#22

Open

baby636 mentioned this pull request Jun 24, 2023

[Snyk] Fix for 1 vulnerabilities baby636/ipfs-desktop#94

Open

irinazheltisheva mentioned this pull request Jun 24, 2023

[Snyk] Fix for 1 vulnerabilities irinazheltisheva/ipfs-desktop#11

Open

eliasbuchwald mentioned this pull request Jun 24, 2023

[Snyk] Security upgrade ipfsd-ctl from 7.2.0 to 11.0.0 eliasbuchwald/ipfs-desktop#10

Open

terrorizer1980 mentioned this pull request Jun 24, 2023

[Snyk] Fix for 1 vulnerabilities terrorizer1980/ipfs-desktop#13

Open

Conversation

hacdias commented Aug 28, 2018

Uh oh!

lidel left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

hacdias commented Sep 4, 2018

Uh oh!

lidel left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

hacdias commented Sep 4, 2018

Uh oh!

lidel left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

lidel commented Sep 5, 2018

Uh oh!

hacdias commented Sep 5, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants