Skip to content

Conversation

felix-schwarz
Copy link
Contributor

@felix-schwarz felix-schwarz commented Nov 26, 2021

Description

This PR changes sorting to use localized sorting across query results and database queries, via the SDK's new OCLOCALIZED collation and sort comparator.

What was previously
1, 100, 11
now becomes
1, 11, 100.

Related Issue

#975

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)

@CLAassistant
Copy link

CLAassistant commented Nov 26, 2021

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
1 out of 2 committers have signed the CLA.

✅ hosy
❌ felix-schwarz
You have signed the CLA already but the status is still pending? Let us recheck it.

@felix-schwarz felix-schwarz changed the base branch from milestone/11.8 to milestone/11.7.2 November 26, 2021 17:01
@felix-schwarz felix-schwarz added this to the 11.9.0-Current milestone Nov 26, 2021
@delete-merged-branch delete-merged-branch bot deleted the branch milestone/11.8.1 December 1, 2021 07:32
@jesmrec
Copy link
Contributor

jesmrec commented Dec 1, 2021

QA checks:

  • Folders sorting (separated from files, with Setting Folder on the top enabled)
  • Files sorting (separated from folders, with Setting Folder on the top enabled)
  • Folder & files together (Setting Folder on the top disabled)
  • Changing sorting method (select a different one and then, select again 'by name')

Approved on my side

@jesmrec
Copy link
Contributor

jesmrec commented Dec 1, 2021

Branch is based on milestone/11.7.2 . It should be rebased to another milestone.

@jesmrec jesmrec added the Approved by QA Approved by QA label Dec 1, 2021
@hosy hosy changed the base branch from milestone/11.7.2 to milestone/11.9.0 December 7, 2021 11:16
@felix-schwarz felix-schwarz changed the base branch from milestone/11.9.0 to milestone/11.8.1 December 22, 2021 09:29
@felix-schwarz felix-schwarz changed the base branch from milestone/11.8.1 to master December 22, 2021 09:30
@felix-schwarz felix-schwarz changed the base branch from master to milestone/11.8 December 22, 2021 09:31
- make SortMethod.comparator use OCSQLiteCollationLocalized.sortComparator
@felix-schwarz felix-schwarz changed the base branch from milestone/11.8 to milestone/11.8.1 December 22, 2021 09:43
@hosy hosy merged commit f6c8ef5 into milestone/11.8.1 Dec 22, 2021
@delete-merged-branch delete-merged-branch bot deleted the feature/sort-order branch December 22, 2021 09:56
hosy added a commit that referenced this pull request Dec 22, 2021
* preparing bug fix release 11.8.1

* - added in-app release notes
- added fastlane changelog
- added Calens changelog entry

* Calens changelog updated

* [feature/oidc-dcr-fallback] Fallback on/ignore OIDC Dynamic Client Registration errors (#1068)

* - update SDK to add support for authentication-oauth2.oidc-fallback-on-client-registration-failure, defaulting to true, to allow the automatic fallback to default client_id / client_secret if OpenID Connect Dynamic Client Registration fails with any error

* - fix infinite OAuth2 token refresh loop via SDK update

* removed ipa name to get a timestamp ipa output name

* changed ipa name by value

* output git branch, set git branch in IPA file name

* remove newline from gitbranch name

* set git branch in branding.plist

* renamed git hash key

* - new version number for upload
- changed changelog folder name

* Calens changelog updated

* [fix/connection-stuck] Fix eternal "Connecting…"  (#1080)

* - update SDK to add support for authentication-oauth2.oidc-fallback-on-client-registration-failure, defaulting to true, to allow the automatic fallback to default client_id / client_secret if OpenID Connect Dynamic Client Registration fails with any error

* - fix infinite OAuth2 token refresh loop via SDK update

* - BookmarkViewController: store user.displayName in .userDisplayName rather than .displayName
- OCBookmark+AppExtensions:
	- make .displayName readonly and mark it as legacy
	- return .userDisplayName for .displayName if the former has a value
- StaticLoginSingleAccountServerListViewController:
	- remove OCConnection code to fetch a user's display name and use bookmark.displayName instead
	- listen for bookmark updates and trigger a header update then accordingly
- update SDK to gain bookmark.userDisplayName support

* - update SDK to gain bookmark.userDisplayName support

Co-authored-by: Matthias Hühne <[email protected]>

* new build number

* use latest develop sdk commit

* [fix/core-overlap] Fix OCCore overlap for first connection (#1081)

* - update SDK to add support for authentication-oauth2.oidc-fallback-on-client-registration-failure, defaulting to true, to allow the automatic fallback to default client_id / client_secret if OpenID Connect Dynamic Client Registration fails with any error

* - fix infinite OAuth2 token refresh loop via SDK update

* - BookmarkViewController: store user.displayName in .userDisplayName rather than .displayName
- OCBookmark+AppExtensions:
	- make .displayName readonly and mark it as legacy
	- return .userDisplayName for .displayName if the former has a value
- StaticLoginSingleAccountServerListViewController:
	- remove OCConnection code to fetch a user's display name and use bookmark.displayName instead
	- listen for bookmark updates and trigger a header update then accordingly
- update SDK to gain bookmark.userDisplayName support

* - update SDK to gain bookmark.userDisplayName support

* Prevent unwanted connection following setup of the first account, preventing an immediate OCCore request and unclean return with possible instance overlap by starting the connection on the - at that time - already removed parent view controller.

* new build number

Co-authored-by: Matthias Hühne <[email protected]>

* - updated build number
- updated release notes
- changed changelog folder name

* Calens changelog updated

* - update SDK (#1064)

- make SortMethod.comparator use OCSQLiteCollationLocalized.sortComparator

* Configuration documentation updated

* added improved sorting to changelog

* new changelog entry

* Calens changelog updated

Co-authored-by: hosy <[email protected]>
Co-authored-by: Felix Schwarz <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Approved by QA Approved by QA
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants