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

Develop -> Design System OS branch #2201

Merged
merged 44 commits into from
Aug 21, 2024
Merged
Changes from 2 commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
5720c1b
FWF-3537 [bugfix] tenant key fix in rbac setting
shuhaib-aot Jul 31, 2024
9b04bfd
FWF-3546 [bugfix] fixed groups listing in dashboard based on the perm…
shuhaib-aot Jul 31, 2024
c01bea9
FWF-3488: [Feature] Update in form response
auslin-aot Aug 6, 2024
19d3b46
Merge pull request #2172 from shuhaib-aot/bugfix/FWF-3537-tenantkey-f…
arun-s-aot Aug 7, 2024
d47c810
Merge pull request #2173 from shuhaib-aot/bugfix/FWF-3546-dashboard-g…
arun-s-aot Aug 7, 2024
e258cf8
Merge pull request #2177 from auslin-aot/feature/FWF-3488-export-supp…
arun-s-aot Aug 7, 2024
baa2681
fixing api ci
shuhaib-aot Aug 7, 2024
799225c
fixing forms-flow-documents-ci.yml
shuhaib-aot Aug 7, 2024
789b45e
FWF-3561: [Bugfix] Fixed multitenant Add registered user error
auslin-aot Aug 7, 2024
6dfa733
updated the multi-tenanc condition
abilpraju-aot Aug 7, 2024
9225c89
FWF-3562: [BugFix] Fixed user list display other tenant roles
auslin-aot Aug 7, 2024
4e9989c
Merge pull request #2181 from auslin-aot/bugfix/FWF-3562-Fix-user-lis…
arun-s-aot Aug 8, 2024
587ca83
Merge pull request #2179 from auslin-aot/bugfix/FWF-3561-fix-multiten…
arun-s-aot Aug 8, 2024
ba94262
updated condition
abilpraju-aot Aug 8, 2024
867a1ce
remove console
abilpraju-aot Aug 8, 2024
58a7e55
FWF:3560[Bugfix] Fixed Admin Login showing Forms page
fahad-aot Aug 8, 2024
5948614
FWF-3563: [BugFix] Fix users list endpoint not showing all users
auslin-aot Aug 8, 2024
e37bf8a
Merge pull request #2180 from abilpraju-aot/bugfix/FWF-3552-permission
arun-s-aot Aug 8, 2024
fd58720
Merge pull request #2183 from auslin-aot/bugfix/FWF-3563-Fix-users-list
arun-s-aot Aug 12, 2024
967318c
test for keycloak upgrade
abilpraju-aot Aug 12, 2024
78e6e1f
Merge pull request #2185 from abilpraju-aot/keycloak-test
arun-s-aot Aug 12, 2024
56746ca
updated keycloak version
abilpraju-aot Aug 12, 2024
9572840
updated role based condition for filters (#2178)
abilpraju-aot Aug 12, 2024
b41095f
added draft enable for create submission user
abilpraju-aot Aug 12, 2024
b4753f2
FWF-3576: [Bugfix] Added view filter as dependent for view tasks
auslin-aot Aug 12, 2024
0665d86
Merge pull request #2187 from abilpraju-aot/keycloak-issue-fix
arun-s-aot Aug 12, 2024
ecb1148
Merge pull request #2188 from abilpraju-aot/bugfix/FWF-3577-draft
arun-s-aot Aug 12, 2024
ca6d31b
Merge pull request #2189 from auslin-aot/bugfix/FWF-3576-Add-view-fil…
arun-s-aot Aug 12, 2024
a93ea48
dashboard seperete route
abilpraju-aot Aug 12, 2024
4870ffb
updated permission for main route
abilpraju-aot Aug 13, 2024
f434f94
[Bugfix]: Changed service url in webroot config
auslin-aot Aug 13, 2024
4340e68
Merge pull request #2191 from abilpraju-aot/bugfix/FWF-3587-submissio…
arun-s-aot Aug 13, 2024
99058a6
Merge pull request #2190 from abilpraju-aot/bugfix/FWF-3579-dashboard
arun-s-aot Aug 13, 2024
1b95a3e
Merge pull request #2193 from auslin-aot/bugfix/changed-service-url
arun-s-aot Aug 13, 2024
07e8d9d
Added FormRoute
fahad-aot Aug 14, 2024
9b3cf6e
conflicts resolved
fahad-aot Aug 16, 2024
2ad684d
upgraded keycloak
abilpraju-aot Aug 16, 2024
2f72d45
FWF-3600: [Bugfix] Fix roles api fail with view_designs permission (#…
auslin-aot Aug 16, 2024
23755c6
Merge pull request #2196 from abilpraju-aot/keycloak-24.0.5
arun-s-aot Aug 16, 2024
bfd0b49
Merge pull request #2182 from fahad-aot/bugfix/FWF-3560-Admin-Login-s…
arun-s-aot Aug 16, 2024
3094cb0
FWF-3488: [Modified] Commented out call to capture subforms, subworkf…
auslin-aot Aug 16, 2024
ad336d5
history call prevention for designer users
abilpraju-aot Aug 16, 2024
e58edcb
Merge pull request #2198 from auslin-aot/feature/FWF-3488-export-supp…
arun-s-aot Aug 20, 2024
e30b466
Merge pull request #2199 from abilpraju-aot/bugfix/FWF-3601-history-call
arun-s-aot Aug 21, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions forms-flow-web/src/components/Form/index.js
Original file line number Diff line number Diff line change
@@ -26,12 +26,8 @@ const CreateFormRoute = ({ component: Component, ...rest }) => (
const FormSubmissionRoute = ({ component: Component, ...rest }) => (
<Route
{...rest}
render={(props) =>
user.includes('create_submissions') ? (
<Component {...props} />
) : (
<AccessDenied userRoles={user} />
)
render={(props) =>
(<Component {...props} /> )
}
/>
);