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

[full-ci] Small fixes #5985

Merged
merged 8 commits into from
Dec 14, 2021

Conversation

diocas
Copy link
Contributor

@diocas diocas commented Nov 5, 2021

Just a bunch of (I hope) fixes:

  • I've made the hidden files hidden by default. This is the current behavior in oc10 and I believe should be the same in web;
  • Generate sourcemap. We did this to make it easier to debug, let me know if you think this should not be pushed to production (edit: made it configurable)
  • Clean paths for drawio (opened a diff PR with this fix)

Some more debatable fixes:

I've changed the default title of the html page from "owncloud" to "loading" (not translated). Ofc this changes to the configured title once the app loads, but if something fails or takes a long time to load, users get confused. (edit: made the title configurable instead)

In the same spirit, I've added information that is displayed before the app loads: a loading message a spinner that appears if it takes more than 1s) to load resources or an error message if something fails. When we had our performance issues, users were getting blank pages and had no idea what was happening, so a bit of feedback is positive. This is not translated, but the users only see the text on error, so it should be acceptable like this.
Fixes #5961: it doesn't improve the performance, but a least gives feedback to the user instead of a white page

@diocas diocas changed the title Up small fixes Small fixes Nov 5, 2021
@pascalwengerter
Copy link
Contributor

pascalwengerter commented Nov 8, 2021

@diocas could you run yarn lint --fix and commit the changes so we can see what CI says? :)

Edit: Also, it seems to have conflicting files. Could you rebase it, too?

@ownclouders
Copy link
Contributor

Results for oC10Trashbin https://drone.owncloud.com/owncloud/web/20127/38/1
💥 The acceptance tests pipeline failed. The build has been cancelled.

@ownclouders
Copy link
Contributor

Results for oC10Trashbin https://drone.owncloud.com/owncloud/web/20133/38/1
💥 The acceptance tests pipeline failed. The build has been cancelled.

@ownclouders
Copy link
Contributor

Results for oCISSharingInternalUsers2 https://drone.owncloud.com/owncloud/web/20139/58/1
💥 The acceptance tests pipeline failed. The build has been cancelled.

@ownclouders
Copy link
Contributor

Results for oC10Trashbin https://drone.owncloud.com/owncloud/web/20175/38/1
💥 The acceptance tests pipeline failed. The build has been cancelled.

@ownclouders
Copy link
Contributor

Results for oC10Trashbin https://drone.owncloud.com/owncloud/web/20224/38/1
💥 The acceptance tests pipeline failed. The build has been cancelled.

@ownclouders
Copy link
Contributor

Results for oC10Trashbin https://drone.owncloud.com/owncloud/web/20307/38/1
💥 The acceptance tests pipeline failed. The build has been cancelled.

@ownclouders
Copy link
Contributor

Results for oC10Trashbin https://drone.owncloud.com/owncloud/web/20311/38/1
💥 The acceptance tests pipeline failed. The build has been cancelled.

@diocas
Copy link
Contributor Author

diocas commented Dec 1, 2021

Rebased with latest master and did some changes:

  • When loading the app takes longer than 1s, instead of showing text, which was in english and was not translated, now I show a spinner similar to ocSpinner.
  • Made the title configurable (since you prob don't want "loading...", as I had before).
  • You separated ActionMenuItem and changed the display of icon and img to an if/else. But the else is never possible, as the icon of an app is always defined (icon: appInfo.icon || 'check_box_outline_blank'), so I inverted it.

@kulmann @pascalwengerter can this be merged? Some of it, at least?

Copy link
Member

@kulmann kulmann left a comment

Choose a reason for hiding this comment

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

nice, thank you! 🚀 just some small comments, otherwise good to go.

}
})
.sort((first, second) => {
// We make the default action based on the order, so put the ones who can be default first
Copy link
Member

Choose a reason for hiding this comment

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

The comment is a bit misleading. In fact the default action only picks from actions where canBeDefault evaluates to true. But it totally makes sense to have the (possible) default actions first. Otherwise a right click with multiple available actions might have an action first that is not the default. Nice catch!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Was this a recent fix? In the past, I had non default apps being used when I clicked a file. But maybe the issue was he fact that every app was having canBeDeFault as true... I'll modify the comment then.

Copy link
Member

Choose a reason for hiding this comment

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

#5970 should fix that. Could you have a look to confirm?

@@ -214,7 +223,8 @@ export default {
const label = this.$gettext('Open in %{ appName }')
return {
name: app.name,
img: app.icon,
icon: app.icon,
Copy link
Member

Choose a reason for hiding this comment

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

Oh, does the app provider return icon names from the design system now? 🤔 I thought the icon value from the app provider is always some image url.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

For us, yes, we added the icons in ODS. But this should be unified in the app provider as well (I will check and ask for changes), as I don't think is intuitive to have them mixed.

packages/web-runtime/src/store/apps.js Outdated Show resolved Hide resolved
@phil-davis
Copy link
Contributor

https://drone.owncloud.com/owncloud/web/20581/9/7
Test Suites: 1 failed, 113 passed, 114 total

A unit test needs to be fixed.

@diocas
Copy link
Contributor Author

diocas commented Dec 2, 2021

@phil-davis I've changed the test. The test assumed we can delete the icon, but this is not true if you set it from the extension configuration (and since icon always has a default value...). So I removed this part and ensure that, when setting img this takes precedence over icon.

Also applied @kulmann requests and added a changelog.

@kulmann
Copy link
Member

kulmann commented Dec 2, 2021

@wkloucek https://drone.owncloud.com/owncloud/web/20609/9/2 states msg="execution failed: commit from DRONE_COMMIT_BEFORE not found: object not found", could you take a look?

@phil-davis
Copy link
Contributor

https://drone.owncloud.com/owncloud/web/20609/9/2
That's a strange drone CI fail - nothing to do with the code of this PR!

@diocas we have made a few fixes today for intermittent annoying things in CI pipelines. Please rebase to latest and force-push and you might get more joy! If it dies again the same, then @wkloucek could look or...

@kulmann
Copy link
Member

kulmann commented Dec 2, 2021

restarted CI, smoke tests are flaky at the moment, sorry

@ownclouders
Copy link
Contributor

Results for oCISBasic https://drone.owncloud.com/owncloud/web/20619/51/1
💥 The acceptance tests pipeline failed. The build has been cancelled.

@phil-davis
Copy link
Contributor

phil-davis commented Dec 2, 2021

A smoke-test pipeline failed. I commented in issue #6082 (comment)
We are now trying to see why that pipeline is having trouble.
I restarted CI.

Edit, update: both smoke test pipelines passed this time!

@owncloud owncloud deleted a comment from update-docs bot Dec 2, 2021
@ownclouders
Copy link
Contributor

Results for oCISBasic https://drone.owncloud.com/owncloud/web/20625/51/1
💥 The acceptance tests pipeline failed. The build has been cancelled.

@ownclouders
Copy link
Contributor

Results for oC10Trashbin https://drone.owncloud.com/owncloud/web/20625/40/1
💥 The acceptance tests pipeline failed. The build has been cancelled.

@phil-davis phil-davis changed the title Small fixes [full-ci] Small fixes Dec 2, 2021
@phil-davis
Copy link
Contributor

I made PR #6088 on top of this to run full-ci and get the tests passing. If I can achieve that tomorrow morning, then I can push any fixes here to get this passing.

@ownclouders
Copy link
Contributor

Results for oC10SharingAccept https://drone.owncloud.com/owncloud/web/20826/16/1
The following scenarios passed on retry:

  • webUISharingAcceptSharesToRoot/acceptShares.feature:108

This title appears before the config title is loaded.
Show simple spinner (similar to ocSpiner) if it takes too long to load (> 1s);
Show error message when failed to load.
Allow img instead of icon
Ensure canBeDefault is honored
If there's an image, it takes precedence over icon (which always has a default)
@sonarcloud
Copy link

sonarcloud bot commented Dec 13, 2021

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

@pascalwengerter pascalwengerter changed the base branch from master to small-cern-fixes December 14, 2021 09:49
@pascalwengerter
Copy link
Contributor

I'll merge this into a temporary PR to be able to work directly on it

@pascalwengerter pascalwengerter merged commit 85355f7 into owncloud:small-cern-fixes Dec 14, 2021
@diocas diocas deleted the up_small_fixes branch December 14, 2021 19:28
@pascalwengerter pascalwengerter mentioned this pull request Dec 22, 2021
22 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
No open projects
Status: Done
Development

Successfully merging this pull request may close these issues.

OC Web showing blank screen in Chrome Browser
5 participants