From c75deaf01cbd1121ea87d3d51c0dd4c3b9873d63 Mon Sep 17 00:00:00 2001 From: Aniket Katkar Date: Wed, 15 Apr 2026 20:05:57 +0530 Subject: [PATCH 01/10] feat: add consolidated UI checkstyle commands for all and changed files --- .github/workflows/ui-checkstyle.yml | 415 +++++----------------------- Makefile | 12 + 2 files changed, 77 insertions(+), 350 deletions(-) diff --git a/.github/workflows/ui-checkstyle.yml b/.github/workflows/ui-checkstyle.yml index 0c93062b83f6..b744da9b50f0 100644 --- a/.github/workflows/ui-checkstyle.yml +++ b/.github/workflows/ui-checkstyle.yml @@ -78,7 +78,6 @@ jobs: runs-on: ubuntu-latest permissions: contents: read - pull-requests: write steps: - uses: actions/checkout@v4 with: @@ -136,51 +135,6 @@ jobs: exit 1 fi - - name: Find existing lint comment - if: always() - uses: peter-evans/find-comment@v3 - id: fc - with: - issue-number: ${{ github.event.pull_request.number }} - comment-author: github-actions[bot] - body-includes: '' - - - name: Post failure comment - if: failure() - uses: peter-evans/create-or-update-comment@v4 - with: - comment-id: ${{ steps.fc.outputs.comment-id }} - issue-number: ${{ github.event.pull_request.number }} - body: | - - ### ❌ Lint Check Failed — ESLint + Prettier + Organise Imports (src) - - The following files have style issues that need to be fixed: - ${{ steps.changed-files.outputs.all_changed_files }} - - **Fix locally (fast — only for changed files in the branch):** - ```bash - make ui-checkstyle-src-changed - ``` - Or to fix all files: - ```bash - make ui-checkstyle-src - ``` - edit-mode: replace - - - name: Delete comment on success - if: success() && steps.fc.outputs.comment-id != '' - uses: actions/github-script@v7 - env: - COMMENT_ID: ${{ steps.fc.outputs.comment-id }} - with: - script: | - github.rest.issues.deleteComment({ - owner: context.repo.owner, - repo: context.repo.repo, - comment_id: process.env.COMMENT_ID - }) - # ────────────────────────────────────────────────────────────────────────── # Job 2: Licence Header Check (all changed files) # ────────────────────────────────────────────────────────────────────────── @@ -189,7 +143,6 @@ jobs: runs-on: ubuntu-latest permissions: contents: read - pull-requests: write steps: - uses: actions/checkout@v4 with: @@ -238,47 +191,6 @@ jobs: exit 1 fi - - name: Find existing licence comment - if: always() - uses: peter-evans/find-comment@v3 - id: fc - with: - issue-number: ${{ github.event.pull_request.number }} - comment-author: github-actions[bot] - body-includes: '' - - - name: Post failure comment - if: failure() - uses: peter-evans/create-or-update-comment@v4 - with: - comment-id: ${{ steps.fc.outputs.comment-id }} - issue-number: ${{ github.event.pull_request.number }} - body: | - - ### ❌ Licence Header Check Failed - - The following files are missing or have outdated licence headers: - ${{ steps.changed-files.outputs.all_changed_files }} - - **Fix locally:** - ```bash - make license-header-fix - ``` - edit-mode: replace - - - name: Delete comment on success - if: success() && steps.fc.outputs.comment-id != '' - uses: actions/github-script@v7 - env: - COMMENT_ID: ${{ steps.fc.outputs.comment-id }} - with: - script: | - github.rest.issues.deleteComment({ - owner: context.repo.owner, - repo: context.repo.repo, - comment_id: process.env.COMMENT_ID - }) - # ────────────────────────────────────────────────────────────────────────── # Job 3: TypeScript Type Check (src) # ────────────────────────────────────────────────────────────────────────── @@ -288,7 +200,6 @@ jobs: runs-on: ubuntu-latest permissions: contents: read - pull-requests: write steps: - uses: actions/checkout@v4 with: @@ -319,53 +230,6 @@ jobs: exit 1 fi - - name: Find existing tsc comment - if: always() - uses: peter-evans/find-comment@v3 - id: fc - with: - issue-number: ${{ github.event.pull_request.number }} - comment-author: github-actions[bot] - body-includes: '' - - - name: Post failure comment - if: failure() - uses: peter-evans/create-or-update-comment@v4 - with: - comment-id: ${{ steps.fc.outputs.comment-id }} - issue-number: ${{ github.event.pull_request.number }} - body: | - - ### ❌ TypeScript Type Check Failed (src) - -
- View type errors (first 50 lines) - - ``` - ${{ steps.tsc.outputs.tsc_errors }} - ``` - -
- - **Run locally to get details about typescript errors:** - ```bash - make tsc-src-fix - ``` - edit-mode: replace - - - name: Delete comment on success - if: success() && steps.fc.outputs.comment-id != '' - uses: actions/github-script@v7 - env: - COMMENT_ID: ${{ steps.fc.outputs.comment-id }} - with: - script: | - github.rest.issues.deleteComment({ - owner: context.repo.owner, - repo: context.repo.repo, - comment_id: process.env.COMMENT_ID - }) - # ────────────────────────────────────────────────────────────────────────── # Job 4: I18n Sync # ────────────────────────────────────────────────────────────────────────── @@ -374,7 +238,6 @@ jobs: runs-on: ubuntu-latest permissions: contents: read - pull-requests: write steps: - uses: actions/checkout@v4 with: @@ -408,47 +271,6 @@ jobs: exit 1 fi - - name: Find existing i18n comment - if: always() - uses: peter-evans/find-comment@v3 - id: fc - with: - issue-number: ${{ github.event.pull_request.number }} - comment-author: github-actions[bot] - body-includes: '' - - - name: Post failure comment - if: failure() - uses: peter-evans/create-or-update-comment@v4 - with: - comment-id: ${{ steps.fc.outputs.comment-id }} - issue-number: ${{ github.event.pull_request.number }} - body: | - - ### ❌ I18n Sync Check Failed - - Translation files are out of sync. Changed files: - ${{ steps.i18n.outputs.changed_files }} - - **Fix locally:** - ```bash - make i18n-sync-fix - ``` - edit-mode: replace - - - name: Delete comment on success - if: success() && steps.fc.outputs.comment-id != '' - uses: actions/github-script@v7 - env: - COMMENT_ID: ${{ steps.fc.outputs.comment-id }} - with: - script: | - github.rest.issues.deleteComment({ - owner: context.repo.owner, - repo: context.repo.repo, - comment_id: process.env.COMMENT_ID - }) - # ────────────────────────────────────────────────────────────────────────── # Job 5: generate:app-docs # ────────────────────────────────────────────────────────────────────────── @@ -457,7 +279,6 @@ jobs: runs-on: ubuntu-latest permissions: contents: read - pull-requests: write steps: - uses: actions/checkout@v4 with: @@ -491,47 +312,6 @@ jobs: exit 1 fi - - name: Find existing app-docs comment - if: always() - uses: peter-evans/find-comment@v3 - id: fc - with: - issue-number: ${{ github.event.pull_request.number }} - comment-author: github-actions[bot] - body-includes: '' - - - name: Post failure comment - if: failure() - uses: peter-evans/create-or-update-comment@v4 - with: - comment-id: ${{ steps.fc.outputs.comment-id }} - issue-number: ${{ github.event.pull_request.number }} - body: | - - ### ❌ App Docs Check Failed - - Generated app docs are stale. Changed files: - ${{ steps.docs.outputs.changed_files }} - - **Fix locally:** - ```bash - make generate-app-docs - ``` - edit-mode: replace - - - name: Delete comment on success - if: success() && steps.fc.outputs.comment-id != '' - uses: actions/github-script@v7 - env: - COMMENT_ID: ${{ steps.fc.outputs.comment-id }} - with: - script: | - github.rest.issues.deleteComment({ - owner: context.repo.owner, - repo: context.repo.repo, - comment_id: process.env.COMMENT_ID - }) - # ────────────────────────────────────────────────────────────────────────── # Job 6: Playwright — ESLint + Prettier + Organise Imports # ────────────────────────────────────────────────────────────────────────── @@ -540,7 +320,6 @@ jobs: runs-on: ubuntu-latest permissions: contents: read - pull-requests: write steps: - uses: actions/checkout@v4 with: @@ -595,51 +374,6 @@ jobs: exit 1 fi - - name: Find existing playwright lint comment - if: always() - uses: peter-evans/find-comment@v3 - id: fc - with: - issue-number: ${{ github.event.pull_request.number }} - comment-author: github-actions[bot] - body-includes: '' - - - name: Post failure comment - if: failure() - uses: peter-evans/create-or-update-comment@v4 - with: - comment-id: ${{ steps.fc.outputs.comment-id }} - issue-number: ${{ github.event.pull_request.number }} - body: | - - ### ❌ Playwright Lint Check Failed — ESLint + Prettier + Organise Imports - - The following files have style issues that need to be fixed: - ${{ steps.changed-files.outputs.all_changed_files }} - - **Fix locally (fast — only for changed files in the branch):** - ```bash - make ui-checkstyle-playwright-changed - ``` - Or to fix all playwright files: - ```bash - make ui-checkstyle-playwright - ``` - edit-mode: replace - - - name: Delete comment on success - if: success() && steps.fc.outputs.comment-id != '' - uses: actions/github-script@v7 - env: - COMMENT_ID: ${{ steps.fc.outputs.comment-id }} - with: - script: | - github.rest.issues.deleteComment({ - owner: context.repo.owner, - repo: context.repo.repo, - comment_id: process.env.COMMENT_ID - }) - # ────────────────────────────────────────────────────────────────────────── # Job 7: Playwright — TypeScript Type Check # ────────────────────────────────────────────────────────────────────────── @@ -649,7 +383,6 @@ jobs: runs-on: ubuntu-latest permissions: contents: read - pull-requests: write steps: - uses: actions/checkout@v4 with: @@ -696,53 +429,6 @@ jobs: exit 1 fi - - name: Find existing playwright tsc comment - if: always() - uses: peter-evans/find-comment@v3 - id: fc - with: - issue-number: ${{ github.event.pull_request.number }} - comment-author: github-actions[bot] - body-includes: '' - - - name: Post failure comment - if: failure() - uses: peter-evans/create-or-update-comment@v4 - with: - comment-id: ${{ steps.fc.outputs.comment-id }} - issue-number: ${{ github.event.pull_request.number }} - body: | - - ### ❌ TypeScript Type Check Failed (playwright) - -
- View type errors (first 50 lines) - - ``` - ${{ steps.tsc.outputs.tsc_errors }} - ``` - -
- - **Run locally to get details about typescript errors::** - ```bash - make tsc-playwright-fix - ``` - edit-mode: replace - - - name: Delete comment on success - if: success() && steps.fc.outputs.comment-id != '' - uses: actions/github-script@v7 - env: - COMMENT_ID: ${{ steps.fc.outputs.comment-id }} - with: - script: | - github.rest.issues.deleteComment({ - owner: context.repo.owner, - repo: context.repo.repo, - comment_id: process.env.COMMENT_ID - }) - # ────────────────────────────────────────────────────────────────────────── # Job 8: Core Components — ESLint + Prettier # ────────────────────────────────────────────────────────────────────────── @@ -751,7 +437,6 @@ jobs: runs-on: ubuntu-latest permissions: contents: read - pull-requests: write steps: - uses: actions/checkout@v4 with: @@ -801,47 +486,77 @@ jobs: exit 1 fi - - name: Find existing lint comment - if: always() + # ────────────────────────────────────────────────────────────────────────── + # Job 9: Report — Post single consolidated summary comment + # ────────────────────────────────────────────────────────────────────────── + report: + needs: [authorize, lint-src, license-header, i18n-sync, app-docs, lint-playwright, lint-core-components] + if: always() && needs.authorize.result == 'success' + runs-on: ubuntu-latest + permissions: + pull-requests: write + steps: + - name: Find existing summary comment uses: peter-evans/find-comment@v3 id: fc with: issue-number: ${{ github.event.pull_request.number }} comment-author: github-actions[bot] - body-includes: '' + body-includes: '' - - name: Post failure comment - if: failure() - uses: peter-evans/create-or-update-comment@v4 - with: - comment-id: ${{ steps.fc.outputs.comment-id }} - issue-number: ${{ github.event.pull_request.number }} - body: | - - ### ❌ Lint Check Failed — ESLint + Prettier (core-components) - - The following files have style issues that need to be fixed: - ${{ steps.changed-files.outputs.all_changed_files }} - - **Fix locally (fast — only for changed files in the branch):** - ```bash - make ui-checkstyle-core-components-changed - ``` - Or to fix all files: - ```bash - make ui-checkstyle-core-components - ``` - edit-mode: replace - - - name: Delete comment on success - if: success() && steps.fc.outputs.comment-id != '' + - name: Post or update summary comment uses: actions/github-script@v7 - env: - COMMENT_ID: ${{ steps.fc.outputs.comment-id }} with: script: | - github.rest.issues.deleteComment({ - owner: context.repo.owner, - repo: context.repo.repo, - comment_id: process.env.COMMENT_ID - }) + const checks = [ + { name: 'ESLint + Prettier + Organise Imports (src)', result: '${{ needs.lint-src.result }}' }, + { name: 'Licence Header', result: '${{ needs.license-header.result }}' }, + { name: 'I18n Sync', result: '${{ needs.i18n-sync.result }}' }, + { name: 'App Docs', result: '${{ needs.app-docs.result }}' }, + { name: 'Playwright — ESLint + Prettier + Organise Imports', result: '${{ needs.lint-playwright.result }}' }, + { name: 'Core Components — ESLint + Prettier', result: '${{ needs.lint-core-components.result }}' }, + ]; + + const failures = checks.filter(c => c.result === 'failure'); + const commentId = '${{ steps.fc.outputs.comment-id }}'; + + if (failures.length === 0) { + if (commentId) { + await github.rest.issues.deleteComment({ + owner: context.repo.owner, + repo: context.repo.repo, + comment_id: parseInt(commentId, 10), + }); + } + return; + } + + const lines = failures.map(c => ` - ❌ **${c.name}**`).join('\n'); + const body = [ + '', + '### ❌ UI Checkstyle Failed', + '', + 'The following checks need to be fixed:', + lines, + '', + '**Fix locally (fast — only checks files changed in this branch):**', + '```bash', + 'make ui-checkstyle-changed', + '```', + ].join('\n'); + + if (commentId) { + await github.rest.issues.updateComment({ + owner: context.repo.owner, + repo: context.repo.repo, + comment_id: parseInt(commentId, 10), + body, + }); + } else { + await github.rest.issues.createComment({ + owner: context.repo.owner, + repo: context.repo.repo, + issue_number: context.issue.number, + body, + }); + } diff --git a/Makefile b/Makefile index 8dff33824274..4f81b15b9801 100644 --- a/Makefile +++ b/Makefile @@ -273,3 +273,15 @@ ui-checkstyle-playwright-changed: .PHONY: ui-checkstyle-core-components-changed ui-checkstyle-core-components-changed: cd openmetadata-ui-core-components/src/main/resources/ui && yarn install --frozen-lockfile && yarn ui-checkstyle:changed + +# Run all full UI checkstyle operations with one command. +.PHONY: ui-checkstyle-all +ui-checkstyle-all: + cd openmetadata-ui/src/main/resources/ui && yarn install --frozen-lockfile && yarn ui-checkstyle && yarn ui-checkstyle:playwright && yarn license-header-fix && yarn i18n && yarn generate:app-docs + cd openmetadata-ui-core-components/src/main/resources/ui && yarn install --frozen-lockfile && yarn lint:fix && yarn pretty + +# Run all changed-file UI checkstyle operations with one command. +.PHONY: ui-checkstyle-changed +ui-checkstyle-changed: + cd openmetadata-ui/src/main/resources/ui && yarn install --frozen-lockfile && yarn ui-checkstyle:changed && yarn ui-checkstyle:playwright:changed && yarn license-header-fix && yarn i18n && yarn generate:app-docs + cd openmetadata-ui-core-components/src/main/resources/ui && yarn install --frozen-lockfile && yarn ui-checkstyle:changed From 0666fa51a36da3ce73ef9fab04480eeb27c0412d Mon Sep 17 00:00:00 2001 From: Aniket Katkar Date: Wed, 15 Apr 2026 20:14:17 +0530 Subject: [PATCH 02/10] update prt to pr --- .github/workflows/ui-checkstyle.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ui-checkstyle.yml b/.github/workflows/ui-checkstyle.yml index b744da9b50f0..a876099372b5 100644 --- a/.github/workflows/ui-checkstyle.yml +++ b/.github/workflows/ui-checkstyle.yml @@ -12,7 +12,7 @@ name: UI Checkstyle on: - pull_request_target: + pull_request: types: - opened - synchronize @@ -44,7 +44,7 @@ jobs: # ────────────────────────────────────────────────────────────────────────── authorize: if: | - github.event_name == 'pull_request_target' && + github.event_name == 'pull_request' && (github.event.action != 'labeled' || github.event.label.name == 'safe to test') runs-on: ubuntu-latest steps: From ed056f06292bc9dbbdf0be1fbdcb762a625ac238 Mon Sep 17 00:00:00 2001 From: Aniket Katkar Date: Wed, 15 Apr 2026 20:17:54 +0530 Subject: [PATCH 03/10] test commit to fail ui-checkstyle --- .../resources/ui/src/components/foundations/typography.tsx | 1 + .../src/main/resources/ui/src/locale/languages/en-us.json | 1 + .../main/resources/ui/src/utils/AdvancedSearchClassBase.ts | 6 ++++++ 3 files changed, 8 insertions(+) diff --git a/openmetadata-ui-core-components/src/main/resources/ui/src/components/foundations/typography.tsx b/openmetadata-ui-core-components/src/main/resources/ui/src/components/foundations/typography.tsx index c7d813f57c2c..abf37c5f16d2 100644 --- a/openmetadata-ui-core-components/src/main/resources/ui/src/components/foundations/typography.tsx +++ b/openmetadata-ui-core-components/src/main/resources/ui/src/components/foundations/typography.tsx @@ -107,6 +107,7 @@ export const Typography = (props: TypographyProps) => { const sizeClass = size ? sizeClasses[size] : undefined; const weightClass = weight ? weightClasses[weight] : undefined; + console.log('sizeClass', sizeClass, 'weightClass', weightClass); const ellipsisConfig = typeof ellipsis === 'object' ? ellipsis : undefined; const isEllipsis = !!ellipsis; diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json index 3f1ada5a7875..cef990e629fd 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json @@ -11,6 +11,7 @@ "accepted-by": "Accepted by", "access": "Access", "access-block-time": "Access block time", + "access-blocked": "Access Blocked", "access-control": "Access Control", "access-policy": "Access Policy", "access-policy-name": "Access Policy Name", diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/AdvancedSearchClassBase.ts b/openmetadata-ui/src/main/resources/ui/src/utils/AdvancedSearchClassBase.ts index 958f3596e2f3..792e52d6da04 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/AdvancedSearchClassBase.ts +++ b/openmetadata-ui/src/main/resources/ui/src/utils/AdvancedSearchClassBase.ts @@ -1235,6 +1235,12 @@ class AdvancedSearchClassBase { entitySearchIndex.includes(index) ); + console.log( + 'shouldAddServiceField', + shouldAddServiceField, + entitySearchIndex + ); + return { ...this.getInitialConfigWithoutFields(isExplorePage), fields: { From 7a00c9c16f531d84e339eb140c7b44b4694d2eca Mon Sep 17 00:00:00 2001 From: Aniket Katkar Date: Wed, 15 Apr 2026 21:42:56 +0530 Subject: [PATCH 04/10] update the comment --- .github/workflows/ui-checkstyle.yml | 68 ++++++++++++++++++++++++----- 1 file changed, 58 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ui-checkstyle.yml b/.github/workflows/ui-checkstyle.yml index a876099372b5..977b65bfb628 100644 --- a/.github/workflows/ui-checkstyle.yml +++ b/.github/workflows/ui-checkstyle.yml @@ -78,6 +78,8 @@ jobs: runs-on: ubuntu-latest permissions: contents: read + outputs: + changed_files: ${{ steps.lint.outputs.changed_files }} steps: - uses: actions/checkout@v4 with: @@ -143,6 +145,8 @@ jobs: runs-on: ubuntu-latest permissions: contents: read + outputs: + changed_files: ${{ steps.license.outputs.changed_files }} steps: - uses: actions/checkout@v4 with: @@ -238,6 +242,8 @@ jobs: runs-on: ubuntu-latest permissions: contents: read + outputs: + changed_files: ${{ steps.i18n.outputs.changed_files }} steps: - uses: actions/checkout@v4 with: @@ -279,6 +285,8 @@ jobs: runs-on: ubuntu-latest permissions: contents: read + outputs: + changed_files: ${{ steps.docs.outputs.changed_files }} steps: - uses: actions/checkout@v4 with: @@ -320,6 +328,8 @@ jobs: runs-on: ubuntu-latest permissions: contents: read + outputs: + changed_files: ${{ steps.lint.outputs.changed_files }} steps: - uses: actions/checkout@v4 with: @@ -437,6 +447,8 @@ jobs: runs-on: ubuntu-latest permissions: contents: read + outputs: + changed_files: ${{ steps.lint.outputs.changed_files }} steps: - uses: actions/checkout@v4 with: @@ -509,12 +521,42 @@ jobs: with: script: | const checks = [ - { name: 'ESLint + Prettier + Organise Imports (src)', result: '${{ needs.lint-src.result }}' }, - { name: 'Licence Header', result: '${{ needs.license-header.result }}' }, - { name: 'I18n Sync', result: '${{ needs.i18n-sync.result }}' }, - { name: 'App Docs', result: '${{ needs.app-docs.result }}' }, - { name: 'Playwright — ESLint + Prettier + Organise Imports', result: '${{ needs.lint-playwright.result }}' }, - { name: 'Core Components — ESLint + Prettier', result: '${{ needs.lint-core-components.result }}' }, + { + name: 'ESLint + Prettier + Organise Imports (src)', + reason: 'One or more source files have linting or formatting issues.', + result: '${{ needs.lint-src.result }}', + files: `${{ needs.lint-src.outputs.changed_files }}`, + }, + { + name: 'Licence Header', + reason: 'One or more files are missing or have an outdated Apache 2.0 licence header.', + result: '${{ needs.license-header.result }}', + files: `${{ needs.license-header.outputs.changed_files }}`, + }, + { + name: 'I18n Sync', + reason: 'Translation locale files are out of sync with `en-us.json`.', + result: '${{ needs.i18n-sync.result }}', + files: `${{ needs.i18n-sync.outputs.changed_files }}`, + }, + { + name: 'App Docs', + reason: 'Generated application docs are stale and need to be regenerated.', + result: '${{ needs.app-docs.result }}', + files: `${{ needs.app-docs.outputs.changed_files }}`, + }, + { + name: 'Playwright — ESLint + Prettier + Organise Imports', + reason: 'One or more Playwright test files have linting or formatting issues.', + result: '${{ needs.lint-playwright.result }}', + files: `${{ needs.lint-playwright.outputs.changed_files }}`, + }, + { + name: 'Core Components — ESLint + Prettier', + reason: 'One or more core-component files have linting or formatting issues.', + result: '${{ needs.lint-core-components.result }}', + files: `${{ needs.lint-core-components.outputs.changed_files }}`, + }, ]; const failures = checks.filter(c => c.result === 'failure'); @@ -531,14 +573,20 @@ jobs: return; } - const lines = failures.map(c => ` - ❌ **${c.name}**`).join('\n'); + const sections = failures.map(c => { + const lines = [`#### ❌ ${c.name}`, c.reason]; + if (c.files && c.files.trim()) { + lines.push('', '
Affected files', '', c.files.trim(), '', '
'); + } + return lines.join('\n'); + }); + const body = [ '', '### ❌ UI Checkstyle Failed', '', - 'The following checks need to be fixed:', - lines, - '', + ...sections.flatMap(s => [s, '']), + '---', '**Fix locally (fast — only checks files changed in this branch):**', '```bash', 'make ui-checkstyle-changed', From 850945c7b178fe09642788f56f915e8757f5e847 Mon Sep 17 00:00:00 2001 From: Aniket Katkar Date: Wed, 15 Apr 2026 21:43:58 +0530 Subject: [PATCH 05/10] Revert "test commit to fail ui-checkstyle" This reverts commit ed056f06292bc9dbbdf0be1fbdcb762a625ac238. --- .../resources/ui/src/components/foundations/typography.tsx | 1 - .../src/main/resources/ui/src/locale/languages/en-us.json | 1 - .../main/resources/ui/src/utils/AdvancedSearchClassBase.ts | 6 ------ 3 files changed, 8 deletions(-) diff --git a/openmetadata-ui-core-components/src/main/resources/ui/src/components/foundations/typography.tsx b/openmetadata-ui-core-components/src/main/resources/ui/src/components/foundations/typography.tsx index abf37c5f16d2..c7d813f57c2c 100644 --- a/openmetadata-ui-core-components/src/main/resources/ui/src/components/foundations/typography.tsx +++ b/openmetadata-ui-core-components/src/main/resources/ui/src/components/foundations/typography.tsx @@ -107,7 +107,6 @@ export const Typography = (props: TypographyProps) => { const sizeClass = size ? sizeClasses[size] : undefined; const weightClass = weight ? weightClasses[weight] : undefined; - console.log('sizeClass', sizeClass, 'weightClass', weightClass); const ellipsisConfig = typeof ellipsis === 'object' ? ellipsis : undefined; const isEllipsis = !!ellipsis; diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json index cef990e629fd..3f1ada5a7875 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json @@ -11,7 +11,6 @@ "accepted-by": "Accepted by", "access": "Access", "access-block-time": "Access block time", - "access-blocked": "Access Blocked", "access-control": "Access Control", "access-policy": "Access Policy", "access-policy-name": "Access Policy Name", diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/AdvancedSearchClassBase.ts b/openmetadata-ui/src/main/resources/ui/src/utils/AdvancedSearchClassBase.ts index 792e52d6da04..958f3596e2f3 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/AdvancedSearchClassBase.ts +++ b/openmetadata-ui/src/main/resources/ui/src/utils/AdvancedSearchClassBase.ts @@ -1235,12 +1235,6 @@ class AdvancedSearchClassBase { entitySearchIndex.includes(index) ); - console.log( - 'shouldAddServiceField', - shouldAddServiceField, - entitySearchIndex - ); - return { ...this.getInitialConfigWithoutFields(isExplorePage), fields: { From 7f5931cece128ed6141a3e710f1202c2b941d1c3 Mon Sep 17 00:00:00 2001 From: Aniket Katkar Date: Wed, 15 Apr 2026 21:44:21 +0530 Subject: [PATCH 06/10] Revert "update prt to pr" This reverts commit 0666fa51a36da3ce73ef9fab04480eeb27c0412d. --- .github/workflows/ui-checkstyle.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ui-checkstyle.yml b/.github/workflows/ui-checkstyle.yml index 977b65bfb628..f8b09871476a 100644 --- a/.github/workflows/ui-checkstyle.yml +++ b/.github/workflows/ui-checkstyle.yml @@ -12,7 +12,7 @@ name: UI Checkstyle on: - pull_request: + pull_request_target: types: - opened - synchronize @@ -44,7 +44,7 @@ jobs: # ────────────────────────────────────────────────────────────────────────── authorize: if: | - github.event_name == 'pull_request' && + github.event_name == 'pull_request_target' && (github.event.action != 'labeled' || github.event.label.name == 'safe to test') runs-on: ubuntu-latest steps: From 55cabcae5eddeb086b76fb5a5a95a5f42ab48b8f Mon Sep 17 00:00:00 2001 From: Aniket Katkar Date: Wed, 15 Apr 2026 22:06:33 +0530 Subject: [PATCH 07/10] Worked on comments --- .github/workflows/ui-checkstyle.yml | 12 ++++++------ Makefile | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ui-checkstyle.yml b/.github/workflows/ui-checkstyle.yml index 0d1116e14832..71ee7a77657a 100644 --- a/.github/workflows/ui-checkstyle.yml +++ b/.github/workflows/ui-checkstyle.yml @@ -529,37 +529,37 @@ jobs: name: 'ESLint + Prettier + Organise Imports (src)', reason: 'One or more source files have linting or formatting issues.', result: '${{ needs.lint-src.result }}', - files: `${{ needs.lint-src.outputs.changed_files }}`, + files: JSON.parse(${{ toJSON(needs.lint-src.outputs.changed_files) }} || '""'), }, { name: 'Licence Header', reason: 'One or more files are missing or have an outdated Apache 2.0 licence header.', result: '${{ needs.license-header.result }}', - files: `${{ needs.license-header.outputs.changed_files }}`, + files: JSON.parse(${{ toJSON(needs.license-header.outputs.changed_files) }} || '""'), }, { name: 'I18n Sync', reason: 'Translation locale files are out of sync with `en-us.json`.', result: '${{ needs.i18n-sync.result }}', - files: `${{ needs.i18n-sync.outputs.changed_files }}`, + files: JSON.parse(${{ toJSON(needs.i18n-sync.outputs.changed_files) }} || '""'), }, { name: 'App Docs', reason: 'Generated application docs are stale and need to be regenerated.', result: '${{ needs.app-docs.result }}', - files: `${{ needs.app-docs.outputs.changed_files }}`, + files: JSON.parse(${{ toJSON(needs.app-docs.outputs.changed_files) }} || '""'), }, { name: 'Playwright — ESLint + Prettier + Organise Imports', reason: 'One or more Playwright test files have linting or formatting issues.', result: '${{ needs.lint-playwright.result }}', - files: `${{ needs.lint-playwright.outputs.changed_files }}`, + files: JSON.parse(${{ toJSON(needs.lint-playwright.outputs.changed_files) }} || '""'), }, { name: 'Core Components — ESLint + Prettier', reason: 'One or more core-component files have linting or formatting issues.', result: '${{ needs.lint-core-components.result }}', - files: `${{ needs.lint-core-components.outputs.changed_files }}`, + files: JSON.parse(${{ toJSON(needs.lint-core-components.outputs.changed_files) }} || '""'), }, ]; diff --git a/Makefile b/Makefile index 4f81b15b9801..6f9a9bb530cd 100644 --- a/Makefile +++ b/Makefile @@ -277,11 +277,11 @@ ui-checkstyle-core-components-changed: # Run all full UI checkstyle operations with one command. .PHONY: ui-checkstyle-all ui-checkstyle-all: - cd openmetadata-ui/src/main/resources/ui && yarn install --frozen-lockfile && yarn ui-checkstyle && yarn ui-checkstyle:playwright && yarn license-header-fix && yarn i18n && yarn generate:app-docs + cd openmetadata-ui/src/main/resources/ui && yarn install --frozen-lockfile && yarn ui-checkstyle && yarn ui-checkstyle:playwright cd openmetadata-ui-core-components/src/main/resources/ui && yarn install --frozen-lockfile && yarn lint:fix && yarn pretty # Run all changed-file UI checkstyle operations with one command. .PHONY: ui-checkstyle-changed ui-checkstyle-changed: - cd openmetadata-ui/src/main/resources/ui && yarn install --frozen-lockfile && yarn ui-checkstyle:changed && yarn ui-checkstyle:playwright:changed && yarn license-header-fix && yarn i18n && yarn generate:app-docs + cd openmetadata-ui/src/main/resources/ui && yarn install --frozen-lockfile && yarn ui-checkstyle:changed && yarn ui-checkstyle:playwright:changed cd openmetadata-ui-core-components/src/main/resources/ui && yarn install --frozen-lockfile && yarn ui-checkstyle:changed From b61e98c16bef6bad50633ba373df977624b900a0 Mon Sep 17 00:00:00 2001 From: Aniket Katkar Date: Wed, 15 Apr 2026 22:08:56 +0530 Subject: [PATCH 08/10] pull request target remove --- .github/workflows/ui-checkstyle.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ui-checkstyle.yml b/.github/workflows/ui-checkstyle.yml index 71ee7a77657a..f2ca0642e34c 100644 --- a/.github/workflows/ui-checkstyle.yml +++ b/.github/workflows/ui-checkstyle.yml @@ -13,7 +13,7 @@ name: UI Checkstyle on: merge_group: - pull_request_target: + pull_request: types: - opened - synchronize @@ -46,13 +46,13 @@ jobs: authorize: if: | github.event_name == 'merge_group' || - (github.event_name == 'pull_request_target' && + (github.event_name == 'pull_request' && (github.event.action != 'labeled' || github.event.label.name == 'safe to test')) runs-on: ubuntu-latest steps: - name: Wait for the labeler uses: lewagon/wait-on-check-action@v1.3.4 - if: ${{ github.event_name == 'pull_request_target' }} + if: ${{ github.event_name == 'pull_request' }} with: ref: ${{ github.event_name == 'merge_group' && github.sha || github.event.pull_request.head.sha }} check-name: Team Label @@ -61,7 +61,7 @@ jobs: - name: Verify PR labels uses: jesusvasquez333/verify-pr-label-action@v1.4.0 - if: ${{ github.event_name == 'pull_request_target' }} + if: ${{ github.event_name == 'pull_request' }} with: github-token: "${{ secrets.GITHUB_TOKEN }}" valid-labels: "safe to test" @@ -507,7 +507,7 @@ jobs: # ────────────────────────────────────────────────────────────────────────── report: needs: [authorize, lint-src, license-header, i18n-sync, app-docs, lint-playwright, lint-core-components] - if: ${{ always() && needs.authorize.result == 'success' && github.event_name == 'pull_request_target' }} + if: ${{ always() && needs.authorize.result == 'success' && github.event_name == 'pull_request' }} runs-on: ubuntu-latest permissions: pull-requests: write From 34f4937ecbca39085a30315c277aee4c678bd4f3 Mon Sep 17 00:00:00 2001 From: Aniket Katkar Date: Wed, 15 Apr 2026 22:13:33 +0530 Subject: [PATCH 09/10] Revert "pull request target remove" This reverts commit b61e98c16bef6bad50633ba373df977624b900a0. --- .github/workflows/ui-checkstyle.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ui-checkstyle.yml b/.github/workflows/ui-checkstyle.yml index f2ca0642e34c..71ee7a77657a 100644 --- a/.github/workflows/ui-checkstyle.yml +++ b/.github/workflows/ui-checkstyle.yml @@ -13,7 +13,7 @@ name: UI Checkstyle on: merge_group: - pull_request: + pull_request_target: types: - opened - synchronize @@ -46,13 +46,13 @@ jobs: authorize: if: | github.event_name == 'merge_group' || - (github.event_name == 'pull_request' && + (github.event_name == 'pull_request_target' && (github.event.action != 'labeled' || github.event.label.name == 'safe to test')) runs-on: ubuntu-latest steps: - name: Wait for the labeler uses: lewagon/wait-on-check-action@v1.3.4 - if: ${{ github.event_name == 'pull_request' }} + if: ${{ github.event_name == 'pull_request_target' }} with: ref: ${{ github.event_name == 'merge_group' && github.sha || github.event.pull_request.head.sha }} check-name: Team Label @@ -61,7 +61,7 @@ jobs: - name: Verify PR labels uses: jesusvasquez333/verify-pr-label-action@v1.4.0 - if: ${{ github.event_name == 'pull_request' }} + if: ${{ github.event_name == 'pull_request_target' }} with: github-token: "${{ secrets.GITHUB_TOKEN }}" valid-labels: "safe to test" @@ -507,7 +507,7 @@ jobs: # ────────────────────────────────────────────────────────────────────────── report: needs: [authorize, lint-src, license-header, i18n-sync, app-docs, lint-playwright, lint-core-components] - if: ${{ always() && needs.authorize.result == 'success' && github.event_name == 'pull_request' }} + if: ${{ always() && needs.authorize.result == 'success' && github.event_name == 'pull_request_target' }} runs-on: ubuntu-latest permissions: pull-requests: write From aa8da19324cf07c19f261a05bfceb8f9dc719636 Mon Sep 17 00:00:00 2001 From: Aniket Katkar Date: Thu, 16 Apr 2026 08:51:36 +0530 Subject: [PATCH 10/10] Worked on comments --- .github/workflows/ui-checkstyle.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ui-checkstyle.yml b/.github/workflows/ui-checkstyle.yml index 71ee7a77657a..f7a3863689bf 100644 --- a/.github/workflows/ui-checkstyle.yml +++ b/.github/workflows/ui-checkstyle.yml @@ -529,37 +529,37 @@ jobs: name: 'ESLint + Prettier + Organise Imports (src)', reason: 'One or more source files have linting or formatting issues.', result: '${{ needs.lint-src.result }}', - files: JSON.parse(${{ toJSON(needs.lint-src.outputs.changed_files) }} || '""'), + files: ${{ toJSON(needs.lint-src.outputs.changed_files) }} || '', }, { name: 'Licence Header', reason: 'One or more files are missing or have an outdated Apache 2.0 licence header.', result: '${{ needs.license-header.result }}', - files: JSON.parse(${{ toJSON(needs.license-header.outputs.changed_files) }} || '""'), + files: ${{ toJSON(needs.license-header.outputs.changed_files) }} || '', }, { name: 'I18n Sync', reason: 'Translation locale files are out of sync with `en-us.json`.', result: '${{ needs.i18n-sync.result }}', - files: JSON.parse(${{ toJSON(needs.i18n-sync.outputs.changed_files) }} || '""'), + files: ${{ toJSON(needs.i18n-sync.outputs.changed_files) }} || '', }, { name: 'App Docs', reason: 'Generated application docs are stale and need to be regenerated.', result: '${{ needs.app-docs.result }}', - files: JSON.parse(${{ toJSON(needs.app-docs.outputs.changed_files) }} || '""'), + files: ${{ toJSON(needs.app-docs.outputs.changed_files) }} || '', }, { name: 'Playwright — ESLint + Prettier + Organise Imports', reason: 'One or more Playwright test files have linting or formatting issues.', result: '${{ needs.lint-playwright.result }}', - files: JSON.parse(${{ toJSON(needs.lint-playwright.outputs.changed_files) }} || '""'), + files: ${{ toJSON(needs.lint-playwright.outputs.changed_files) }} || '', }, { name: 'Core Components — ESLint + Prettier', reason: 'One or more core-component files have linting or formatting issues.', result: '${{ needs.lint-core-components.result }}', - files: JSON.parse(${{ toJSON(needs.lint-core-components.outputs.changed_files) }} || '""'), + files: ${{ toJSON(needs.lint-core-components.outputs.changed_files) }} || '', }, ];