Skip to content

[full-ci] Multiple fixes#6618

Merged
kulmann merged 9 commits intoowncloud:masterfrom
cernbox:multiple_fixes
Mar 24, 2022
Merged

[full-ci] Multiple fixes#6618
kulmann merged 9 commits intoowncloud:masterfrom
cernbox:multiple_fixes

Conversation

@diocas
Copy link
Copy Markdown
Contributor

@diocas diocas commented Mar 17, 2022

As we discussed, I'm trying to push some of our changes, in particular I refactored the code to make some parts optional.

Renaming a share, permanently deleting files and showing the custom permissions role are now optional. By default, it keeps the same behavior as the current master.

Added the possibility to add "tags" while searching for users (as we discussed).

Also as discussed, I've added the "editor" role for single files public links. This seems not to be possible with oc10, so I've added a check to enable it only for oCIS.
(this needs another fix... I saw the "rename" button on the file and I shouldn't, but at least if fails when I tried to do it)

@elizavetaRa is still working on the css for the drop down menus.

Fixes #6324
Fixes #5913

@update-docs
Copy link
Copy Markdown

update-docs Bot commented Mar 17, 2022

Thanks for opening this pull request! The maintainers of this repository would appreciate it if you would create a changelog item based on your changes.

@diocas
Copy link
Copy Markdown
Contributor Author

diocas commented Mar 18, 2022

Still need to have a look at the tests

@kulmann
Copy link
Copy Markdown
Contributor

kulmann commented Mar 21, 2022

hey @diocas could you run yarn lint --fix on your branch and commit the result?

computed: {
...mapGetters('Files', ['highlightedFile']),
...mapGetters(['getToken', 'capabilities']),
...mapGetters(['getToken', 'capabilities', 'isOcis']),
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

The isOcis helper has been removed in #6619 in favour of checking the resharing capability - do you mind looking into the usage of that? it needs to be used in a setup call (composition api).

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I do not understand what you asked, sorry. I've replaced with just a check from a capability.


static list(isFolder: boolean): ShareRole[] {
return this.all.filter((r) => r.folder === isFolder)
static list(isFolder: boolean, isOcis: boolean = false): ShareRole[] {
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Can you rename that usage of isOcis to a capability?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I've changed to capabilities.files_sharing?.public?.can_edit is this ok?

@diocas
Copy link
Copy Markdown
Contributor Author

diocas commented Mar 22, 2022

Sorry for the linting.. Don't know how I forgot.

@diocas diocas force-pushed the multiple_fixes branch 2 times, most recently from f6a0b67 to 265e02f Compare March 22, 2022 14:15
@diocas
Copy link
Copy Markdown
Contributor Author

diocas commented Mar 22, 2022

@kulmann I think the test got stuck, can you run them again? (I think I've "fixed" the issues, ofc the additions still need proper testing)

const store = new Vuex.Store({
getters: {
capabilities: () => {
return {}
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

My gripe with this is that it doesn't check the newly added logic via this.capabilities?.files?.permanent_deletion (as in it should now test both cases, one where permanent_deletion is true and one where it's false)

Copy link
Copy Markdown
Contributor Author

@diocas diocas Mar 22, 2022

Choose a reason for hiding this comment

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

Yes, I mentioned it above. I can try to add some tests, but not sure when.

@ownclouders
Copy link
Copy Markdown
Contributor

Results for oC10IntegrationApp1 https://drone.owncloud.com/owncloud/web/24057/71/1

💥 The acceptance tests failed on retry. Please find the screenshots inside ...

webUIPrivateLinks-accessingPrivateLinks_feature-L17.png

webUIPrivateLinks-accessingPrivateLinks_feature-L17.png

💥 The acceptance tests pipeline failed. The build has been cancelled.

@kulmann kulmann changed the title Multiple fixes [full-ci] Multiple fixes Mar 23, 2022
@sonarqubecloud
Copy link
Copy Markdown

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@kulmann kulmann merged commit 7f82a61 into owncloud:master Mar 24, 2022
@diocas diocas deleted the multiple_fixes branch March 24, 2022 11:41
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.

"empty trashbin" as capability User/group filters type does not work

5 participants