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] Move language selection to the account page and kill settings app #8294

Merged
merged 6 commits into from
Jan 24, 2023

Conversation

JammingBen
Copy link
Contributor

@JammingBen JammingBen commented Jan 23, 2023

Description

The language selection has been moved from the settings app to the personal account page. The settings app has been removed from the default configs because we don't need it currently.

Fixes #8290

Needs a follow-up PR in oCIS to adjust the configs there.

Screenshots (if appropriate):

image

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Technical debt
  • Tests

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.

Found two issues:

  • the Edit button in the top right of the account page can be removed for ocis... there is no external editing anymore now with this PR
  • listValues returns null if no language has been set before. Your implementation doesn't handle that, I don't see a rendered dropdown and a console error instead.

@ownclouders
Copy link
Contributor

Results for acceptance oCIS https://drone.owncloud.com/owncloud/web/31978/53/1

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

webUIAccount-accountInformation_feature-L10.png

webUIAccount-accountInformation_feature-L10.png

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

@ownclouders
Copy link
Contributor

Results for acceptance oC10 https://drone.owncloud.com/owncloud/web/31981/13/1

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

webUIAccount-accountInformation_feature-L10.png

webUIAccount-accountInformation_feature-L10.png

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

@JammingBen JammingBen changed the title Move language selection to the account page and kill settings app [full-ci] Move language selection to the account page and kill settings app Jan 23, 2023
@JammingBen JammingBen requested a review from kulmann January 23, 2023 14:14
private function addAccountEditLinkToConfig(array $config): array {
$options = $config['options'] ?? [];
$serverUrl = $this->request->getServerProtocol() . '://' . $this->request->getServerHost();
$options['accountEditLink'] = [
Copy link
Member

Choose a reason for hiding this comment

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

This should only be done if the config.json loaded from disk didn't specify it on its own. I.e. if acountEditLink already exists you can return early.

Copy link
Member

@kulmann kulmann Jan 23, 2023

Choose a reason for hiding this comment

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

see 36cc027

@kulmann kulmann force-pushed the move-language-select branch from 96363f6 to 36cc027 Compare January 23, 2023 23:39
@sonarcloud
Copy link

sonarcloud bot commented Jan 23, 2023

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 1 Code Smell

59.8% 59.8% Coverage
0.0% 0.0% Duplication

@kulmann kulmann merged commit 08cf73e into master Jan 24, 2023
@delete-merged-branch delete-merged-branch bot deleted the move-language-select branch January 24, 2023 00:26
ownclouders pushed a commit that referenced this pull request Jan 24, 2023
Author: Jannik Stehle <[email protected]>
Date:   Tue Jan 24 01:26:08 2023 +0100

    [full-ci] Move language selection to the account page and kill settings app (#8294)

    * Move language selection to the account page and kill settings app

    Co-authored-by: Dominik Schmidt <[email protected]>
    Co-authored-by: Benedikt Kulmann <[email protected]>
@micbar micbar mentioned this pull request May 3, 2023
89 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

OCIS: Inactive navigation items in Settings menu invisible when in light mode
4 participants