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

Make no-user entry with avatar when there is no others with access #39022

Conversation

JeaNugroho
Copy link

@JeaNugroho JeaNugroho commented Jun 27, 2023

Summary

Make an empty entry with predefined info for when there's no others with access. This can be seen in the share tab inside the files view by clicking on any file/folder share button.

Before

Link to conversation

After (with avatar - first commit)

After-ToggleOthersWithAccess

After (without avatar - second commit)

After-ToggleOthersWithAccess-woAvatar

Checklist

@szaimen szaimen added the 3. to review Waiting for reviews label Jun 27, 2023
@szaimen szaimen added this to the Nextcloud 28 milestone Jun 27, 2023
@szaimen szaimen requested review from jancborchardt, marcoambrosini, nimishavijay, a team, susnux, artonge and Pytal and removed request for a team June 27, 2023 08:09
Copy link
Member

@jancborchardt jancborchardt left a comment

Choose a reason for hiding this comment

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

I'd say without avatar looks better, but the indent is good. (So the emptycontent text is indented as if there is an avatar, do you know what I mean? :)

Copy link
Contributor

@artonge artonge left a comment

Choose a reason for hiding this comment

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

Nice idea, few comments though :)

apps/files_sharing/l10n/en_GB.js Outdated Show resolved Hide resolved
apps/files_sharing/src/views/SharingInherited.vue Outdated Show resolved Hide resolved
@JeaNugroho
Copy link
Author

@jancborchardt

I'd say without avatar looks better, but the indent is good. (So the emptycontent text is indented as if there is an avatar, do you know what I mean? :)

This is what it looks like since the 3rd commit:
Screen Shot 2023-06-27 at 7 50 42 PM
Screen Shot 2023-06-27 at 7 50 10 PM

I hope this is what we wanted to achieve 😁

Copy link
Contributor

@artonge artonge left a comment

Choose a reason for hiding this comment

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

Nice, feels much cleaner :)

apps/files_sharing/src/views/SharingInherited.vue Outdated Show resolved Hide resolved
apps/files_sharing/src/views/SharingInherited.vue Outdated Show resolved Hide resolved
Copy link
Member

@nimishavijay nimishavijay left a comment

Choose a reason for hiding this comment

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

Looks great with the fix! 🚀

@JeaNugroho
Copy link
Author

Looks great with the fix! 🚀

@nimishavijay

Thanks, appreciate it! Do you mind reviewing another PR that I made? It's solving a simpler issue, and you can find it here.

On another note, I'm looking to work on some backend issues, and I would appreciate it if I can reach out to someone who I can ask about backend or any other questions to. And I might as well ask where would be a good place to chat with the person (if it's through help.cloud.com, I'd like to know which channel. Thanks in advance!

@JeaNugroho
Copy link
Author

JeaNugroho commented Jun 30, 2023

How can I merge these changes? @artonge @nimishavijay @jancborchardt
It says "Required statuses must pass before merging", but I'm not exactly sure on how to fix them or if there's any directions to do it. I hope someone can guide me on how to deliver these changes so it can be merged

@nimishavijay
Copy link
Member

@JeaNugroho I am not too sure about the failing checks, maybe @szaimen or @artonge can help out here?
help.nextcloud.com is a great place to start asking about development questions! We also have a community Talk chat where there are a lot of active contributors who will also be able to help you out :)

@susnux
Copy link
Contributor

susnux commented Jul 1, 2023

It says "Required statuses must pass before merging", but I'm not exactly sure on how to fix them or if there's any directions to do it.

You need to fix the issues detected by the CI:

  1. The Node CI fails because you need to build the JS assets and commit them (npm run build)
  2. The Lint CI fails because you have some code style issues (they are also reported here on the changed files section), most of the time you can solve it by run npm run lint:fix.

Copy link
Contributor

@susnux susnux left a comment

Choose a reason for hiding this comment

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

LGTM, just see the comment about resolving the CI issues :)

@artonge
Copy link
Contributor

artonge commented Jul 3, 2023

Hey @JeaNugroho can you rebase and commit the compiled files again?
Any conflict under /dist can be ignored.

@JeaNugroho
Copy link
Author

Hey @JeaNugroho can you rebase and commit the compiled files again?
Any conflict under /dist can be ignored.

@artonge Working on it! Is that why Node CI failed even after I tried to fix it? 😅

@JeaNugroho JeaNugroho force-pushed the Jean-NextCloudServer/MakeNoUserEntry-UponOthersWithAccessToggle branch from e37fbd3 to 08f5aed Compare July 4, 2023 01:11
@JeaNugroho
Copy link
Author

JeaNugroho commented Jul 4, 2023

Have just rebased! I assume I'll have to wait for all checks to complete and continue fixing more issues in case some required CI checks fail. I hope someone can offer help with that failed required CI checks 😊
It was good help offered by @susnux , but had to start rebasing first after I attempted to do npm run build

@nimishavijay @artonge @jancborchardt

@artonge
Copy link
Contributor

artonge commented Jul 4, 2023

Can you run npm run lint:fix, and then rebase, compile, commit again?

Something like:

git fetch
git rebase origin/master
# Complete the rebase

npm run lint:fix
npm run build
git commit -am '...' --signoff
git push

@JeaNugroho
Copy link
Author

JeaNugroho commented Jul 4, 2023

Can you run npm run lint:fix, and then rebase, compile, commit again?

Something like:

git fetch
git rebase origin/master
# Complete the rebase

npm run lint:fix
npm run build
git commit -am '...' --signoff
git push

@artonge Yes I can! Though I'm not sure why the Node CI still fails even after I tried to sort it out. By the way, your terminal snippet shows that we rebase first and then fix the lint issues, which is not in the same order as what you mentioned in your question. I did the following comment using your snippet sequence fyi

@JeaNugroho
Copy link
Author

JeaNugroho commented Jul 4, 2023

@artonge So based on your last two comments, what should I do and what commands should I run? I only ran the commands discussed in this PR so far. I can close this PR and restart through a new PR if it's easier for everyone 😁

@artonge
Copy link
Contributor

artonge commented Jul 5, 2023

This page https://github.com/nextcloud/server/pull/39022/files need to display your changes only and the result of npm run build.

The rebase might have gone wrong.
If creating another PR is easier for you, then do that. But it should be possible to revert the state of this PR to contain your change only.

@skjnldsv skjnldsv mentioned this pull request Nov 1, 2023
This was referenced Nov 6, 2023
This was referenced Nov 14, 2023
@blizzz blizzz modified the milestones: Nextcloud 28, Nextcloud 29 Nov 23, 2023
@skjnldsv
Copy link
Member

Lots of conflicts and unrelated changes

@skjnldsv skjnldsv added bug 2. developing Work in progress feature: sharing feature: files and removed 3. to review Waiting for reviews labels Feb 23, 2024
This was referenced Mar 12, 2024
This was referenced Mar 20, 2024
@skjnldsv skjnldsv mentioned this pull request Mar 28, 2024
81 tasks
@skjnldsv skjnldsv modified the milestones: Nextcloud 29, Nextcloud 30 Mar 28, 2024
This was referenced Jul 30, 2024
This was referenced Aug 5, 2024
@skjnldsv skjnldsv mentioned this pull request Aug 13, 2024
@skjnldsv skjnldsv closed this Aug 14, 2024
@skjnldsv skjnldsv removed this from the Nextcloud 30 milestone Aug 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Emptycontent view for "Others with access" section
8 participants