Skip to content

Feat: Folder permission system#15028

Merged
gsmithun4 merged 48 commits intomainfrom
feat/folder-permission
Mar 19, 2026
Merged

Feat: Folder permission system#15028
gsmithun4 merged 48 commits intomainfrom
feat/folder-permission

Conversation

@vjaris42
Copy link
Copy Markdown
Collaborator

@vjaris42 vjaris42 commented Jan 21, 2026

QA checklist

  • Test cases preparation
  • Test case review by dev and product team
  • Integration Testing.
  • Smoke Testing.
  • Bug Fixes Verification.
  • Cross browser UI check. (Firefox, safari, chrome)
  • Verify features on Dark and Light mode.
  • Automation Testing.
  • Test System Upgrade - (Sanity + Test System Specific Cases)
  • Performance Benchmark
Screenshot 2026-03-16 at 19 47 14

@nechalmaggon nechalmaggon added destroy-ee-lts-review-app For lts (github action build and deploy on render)) create-ee-lts-review-app uses ./docker/LTS/ee/ee-preview.Dockerfile and removed create-ee-lts-review-app uses ./docker/LTS/ee/ee-preview.Dockerfile destroy-ee-lts-review-app For lts (github action build and deploy on render)) labels Feb 11, 2026
GroupPermissionsRepository,
ValidAppGuard,
],
exports: [AppsUtilService],
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

should not be exported. already exported from apps module

@github-actions
Copy link
Copy Markdown
Contributor

🚀 EE LTS Review App Deployed!

Resource Link
App URL https://tooljet-ee-lts-pr-15028.onrender.com
Render Dashboard https://dashboard.render.com/web/srv-d66b1lpr0fns73cv1mng
Docker Image tooljet/tooljet-render:ee-lts-pr-15028

Deployed using DockerHub-based pipeline - LTS Edition

@github-actions github-actions bot added active-ee-lts-review-app For lts (github action build and deploy on render)) and removed create-ee-lts-review-app uses ./docker/LTS/ee/ee-preview.Dockerfile labels Feb 11, 2026
@CLAassistant
Copy link
Copy Markdown

CLAassistant commented Feb 23, 2026

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.
3 out of 5 committers have signed the CLA.

✅ RndmCodeGuy20
✅ gsmithun4
✅ vjaris42
❌ Pratush
❌ YuktiGoyal02


Pratush seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account.
You have signed the CLA already but the status is still pending? Let us recheck it.

@Pratush613 Pratush613 changed the base branch from lts-3.16 to main February 23, 2026 08:35
@github-actions
Copy link
Copy Markdown
Contributor

🔄 EE LTS Review App Rebuilding

New commit f913cab pushed. Image updated and deployment triggered.

Using cached layers for faster build

@github-actions
Copy link
Copy Markdown
Contributor

🔄 EE LTS Review App Rebuilding

New commit 7fa7765 pushed. Image updated and deployment triggered.

Using cached layers for faster build

@github-actions
Copy link
Copy Markdown
Contributor

🔄 EE LTS Review App Rebuilding

New commit 4b3db32 pushed. Image updated and deployment triggered.

Using cached layers for faster build

@github-actions
Copy link
Copy Markdown
Contributor

🔄 EE Pre-release Review App Rebuilding

New commit 5add8ae pushed. Image updated and deployment triggered.

Using cached layers for faster build

@github-actions
Copy link
Copy Markdown
Contributor

🔄 EE Pre-release Review App Rebuilding

New commit fa17eba pushed. Image updated and deployment triggered.

Using cached layers for faster build

@github-actions
Copy link
Copy Markdown
Contributor

🔄 EE Pre-release Review App Rebuilding

New commit 46a1398 pushed. Image updated and deployment triggered.

Using cached layers for faster build

@github-actions
Copy link
Copy Markdown
Contributor

🔄 EE Pre-release Review App Rebuilding

New commit b2be62c pushed. Image updated and deployment triggered.

Using cached layers for faster build

@github-actions
Copy link
Copy Markdown
Contributor

🔄 EE Pre-release Review App Rebuilding

New commit 86d6066 pushed. Image updated and deployment triggered.

Using cached layers for faster build

@adishM98
Copy link
Copy Markdown
Collaborator

🔍 Checking linked submodule PRs for feat/folder-permission:

✅ ee-server PR - https://github.com/ToolJet/ee-server/pull/364
✅ ee-frontend PR - https://github.com/ToolJet/ee-frontend/pull/342

📝 Note: The submodule PRs will be auto-merged once you merge this base PR-15028 into main.

@gsmithun4 gsmithun4 merged commit 0431098 into main Mar 19, 2026
169 of 171 checks passed
@gsmithun4 gsmithun4 deleted the feat/folder-permission branch March 19, 2026 16:30
@github-actions github-actions bot removed the active-ee-pre-release-review-app For pre-release (github action build and deploy on render)) label Mar 19, 2026
akshaysasidrn added a commit that referenced this pull request Mar 23, 2026
Restores FOLDER enum, entities (FoldersGroupPermissions, GroupFolders),
type definitions, FEATURE_KEY entries, and relation mappings that were
dropped when PR #15028 was merged to main. Also fixes EE constants to
use folderCRUD (matching actual DB schema) instead of folderCreate/
folderDelete.
akshaysasidrn pushed a commit that referenced this pull request Mar 24, 2026
* feat: Folder permission system

* fix(group-permissions): resolve custom group validation, folder edit check, and UI inconsistencie

* edit folder container && no folder in custom resource

* fix the ui for custom in empty state

* fix: coercion logic for folder permissions

* feat: enhance folder permissions handling in app components

* feat: add folder granular permissions handling in user apps permissions

* feat: implement granular folder permissions in ability guard and service

* feat: improve error handling for folder permissions with specific messages

* feat: enhance EnvironmentSelect component to handle disabled state and improve display logic

* chore: bump ee submodules

* feat: Update permission prop to isEditable in BaseManageGranularAccess component

* chore: bump ee server submodule

* fix: refine folder visibility logic based on user permissions

* feat: enhance MultiValue rendering and styling for "All environments" option

* feat: implement folder ownership checks and enhance app permissions handling

* feat: enhance folder permissions handling for app ownership and actions

* chore: clarify folder creation and deletion permissions in workspace context

* fix: update folder permission labels

* fixed folder permission cases

* fixed css class issue

* minor fix

* feat: streamline folder permissions handling by removing redundant checks and simplifying access logic

* refactor: made error message consistent

* fix: add missing permission message for folder deletion action

* refactor: consolidate forbidden messages for folder actions and maintain consistency

* feat: streamline permission handling and improve app visibility logic

* fix: remove default access denial message in AbilityGuard

* fixed all user page functionality falky case

* Fixed profile flaky case

* fixed granular access flaky case

* chore: revert package-lock.json

* chore: revert frontend/package-lock.json to main

* refactor: revert folder operations

* fix: remove unused AppEnvironmentsModule and AppsUtilService exports

---------

Co-authored-by: gsmithun4 <gsmithun4@gmail.com>
Co-authored-by: Pratush <pratush@Pratushs-MBP.lan>
Co-authored-by: Shantanu Mane <maneshantanu.20@gmail.com>
Co-authored-by: Yukti Goyal <yuktigoyal02@gmail.com>
akshaysasidrn added a commit that referenced this pull request Mar 24, 2026
Resolves ~19 merge conflicts from main's PR #15028 (app-folder
permission system). Key changes:

- Replace folderCRUD with folderCreate/folderDelete (main's split)
- Keep dataSourceFolderCRUD for DS folder feature
- Accept main's folder entity (createdBy), ability refactor, folder
  permission guards, and CASL rules
- Add DS folder types/endpoints alongside main's folder types
- Delete redundant migration 1774255111000 (superseded by main's
  1766500000000-AddFolderPermissionSystem)
- Fix EE external-apis and ability services for new column names
- Update all test helpers to use new column names

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants