You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@airflow.apache.org by "choo121600 (via GitHub)" <gi...@apache.org> on 2025/07/24 03:39:13 UTC

[PR] Standardize key sorting to match jsonc natural sort rule [airflow]

choo121600 opened a new pull request, #53692:
URL: https://github.com/apache/airflow/pull/53692

## problem
This PR resolves an inconsistency between the ESLint jsonc/sort-keys rule and the key sorting logic used in check_translations_completeness.py.
https://github.com/apache/airflow/blob/0c178848bf42dcb1a48435ddb09056ba9625daf9/airflow-core/src/airflow/ui/rules/jsonc.js#L37-L45

https://github.com/apache/airflow/blob/0c178848bf42dcb1a48435ddb09056ba9625daf9/dev/i18n/check_translations_completeness.py#L522-L534
The mismatch caused unstable key ordering in translation files, leading to unnecessary diffs and confusion.

To address this, the key sorting logic is updated to follow the same behavior as ESLint JSONC(natural: true).

## Changes:
* Replace custom ESLint-style sorting with natural sort (case-insensitive, human-friendly order)
* Rename eslint_key_sort → natural_key_sort for clarity

closes: #53663

<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->

<!--
Thank you for contributing! Please make sure that your code changes
are covered with tests. And in case of new features or big changes
remember to adjust the documentation.

Feel free to ping committers for the review!

In case of an existing issue, reference it using one of the following:

closes: #ISSUE
related: #ISSUE

How to write a good git commit message:
http://chris.beams.io/posts/git-commit/
-->

---
**^ Add meaningful description above**
Read the **[Pull Request Guidelines](https://github.com/apache/airflow/blob/main/contributing-docs/05_pull_requests.rst#pull-request-guidelines)** for more information.
In case of fundamental code changes, an Airflow Improvement Proposal ([AIP](https://cwiki.apache.org/confluence/display/AIRFLOW/Airflow+Improvement+Proposals)) is needed.
In case of a new dependency, check compliance with the [ASF 3rd Party License Policy](https://www.apache.org/legal/resolved.html#category-x).
In case of backwards incompatible changes please leave a note in a newsfragment file, named `{pr_number}.significant.rst` or `{issue_number}.significant.rst`, in [airflow-core/newsfragments](https://github.com/apache/airflow/tree/main/airflow-core/newsfragments).

--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

Re: [PR] Standardize key sorting to match jsonc natural sort rule [airflow]

Posted by "potiuk (via GitHub)" <gi...@apache.org>.

potiuk merged PR #53692:
URL: https://github.com/apache/airflow/pull/53692


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

Re: [PR] Standardize key sorting to match jsonc natural sort rule [airflow]

Posted by "potiuk (via GitHub)" <gi...@apache.org>.

potiuk commented on PR #53692:
URL: https://github.com/apache/airflow/pull/53692#issuecomment-3112396275

   > I think it's better to separate the formatting cleanup (e.g. whitespace) for the en translation files handled by pre-commit. I'll open a separate PR for that 😉
   
   Yeah. I think that was never an issue, the formatting we use when --add-missing is used is consistent with the one expected and fixed by eslint :)


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

Re: [PR] Standardize key sorting to match jsonc natural sort rule [airflow]

Posted by "choo121600 (via GitHub)" <gi...@apache.org>.

choo121600 commented on PR #53692:
URL: https://github.com/apache/airflow/pull/53692#issuecomment-3111851367

   I think it's better to separate the formatting cleanup (e.g. whitespace) for the en translation files handled by pre-commit.
   I'll open a separate PR for that 😉


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

Re: [PR] Standardize key sorting to match jsonc natural sort rule [airflow]

Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.

github-actions[bot] commented on PR #53692:
URL: https://github.com/apache/airflow/pull/53692#issuecomment-3112396664

   ### Backport failed to create: v3-0-test. View the failure log <a href='https://github.com/apache/airflow/actions/runs/16490879958'> Run details </a>
   
   <table>
       <tr>
           <th>Status</th>
           <th>Branch</th>
           <th>Result</th>
       </tr>
       <tr>
           <td>❌</td>
           <td>v3-0-test</td>
           <td><a href="https://github.com/apache/airflow/commit/9a186a5826ef7c03f83d6ad501314e3f551a84b5"><img src='https://img.shields.io/badge/Commit-9a186a5-red' alt='Commit Link'></a></td>
       </tr>
   </table>
   
   You can attempt to backport this manually by running:
   
   ```bash
   cherry_picker 9a186a5 v3-0-test
   ```
   
   This should apply the commit to the v3-0-test branch and leave the commit in conflict state marking
   the files that need manual conflict resolution.
   
   After you have resolved the conflicts, you can continue the backport process by running:
   
   ```bash
   cherry_picker --continue
   ```
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

Re: [PR] Standardize key sorting to match jsonc natural sort rule [airflow]

Posted by "potiuk (via GitHub)" <gi...@apache.org>.

potiuk commented on PR #53692:
URL: https://github.com/apache/airflow/pull/53692#issuecomment-3112397289

   No need to backport it.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org