Skip to content

Add spec-driven Swagger auth controls #1779

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.

Sign up for GitHub

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

Open
krowvin wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Add spec-driven Swagger auth controls #1779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
043ae00
Update Groundwork Water dependency
krowvin Jun 11, 2026
8a08ca1
Add spec-driven Swagger auth controls
krowvin Jun 11, 2026
73905b0
Fix local Keycloak dev configuration
krowvin Jun 11, 2026
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
58 changes: 47 additions & 11 deletions cda-gui/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cda-gui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
},
"dependencies": {
"@tanstack/react-query": "^5.64.1",
"@usace-watermanagement/groundwork-water": "^3.3.1",
"@usace-watermanagement/groundwork-water": "^3.9.0",

@krowvin krowvin Jun 11, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

older GWW only supported direct grant

"@usace/groundwork": "^3.14.18",
"cwmsjs": "^2.3.2-2025.3.19",
"dayjs": "^1.11.13",
Expand Down
127 changes: 127 additions & 0 deletions cda-gui/src/css/swagger.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,130 @@ body {
margin: 0;
background: #fafafa;
}

.swagger-auth-bar {

@krowvin krowvin Jun 11, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

I was wondering if this should be tailwind css? Preference?

align-items: center;
background: #f4f8fb;
border: 1px solid #c7d8e5;
border-radius: 6px;
display: flex;
gap: 1rem;
justify-content: space-between;
margin: 0.75rem 0 1rem;
padding: 1rem;
}

.swagger-auth-bar > div:first-child {
display: flex;
flex-direction: column;
gap: 0.25rem;
min-width: 0;
}

.swagger-auth-bar strong {
color: #1f2933;
font-size: 1rem;
}

.swagger-auth-bar span {
color: #394b59;
font-size: 0.95rem;
}

.swagger-auth-actions {
align-items: center;
display: flex;
flex-wrap: wrap;
gap: 0.5rem;
justify-content: flex-end;
}

.swagger-auth-mode-note {
align-items: center;
color: #394b59;
display: inline-flex;
font-size: 0.9rem;
}

.swagger-auth-mode-select {
align-items: center;
display: inline-flex;
gap: 0.45rem;
}

.swagger-auth-mode-select span {
color: #394b59;
font-size: 0.875rem;
white-space: nowrap;
}

.swagger-auth-mode-select select {
border: 1px solid #c7d8e5;
border-radius: 6px;
background: #ffffff;
color: #1f2933;
font-size: 0.9rem;
height: 2.35rem;
min-width: 10rem;
padding: 0 0.6rem;
}

.swagger-auth-button {
border: 1px solid transparent;
border-radius: 4px;
cursor: pointer;
font-size: 0.9rem;
font-weight: 600;
height: 2.35rem;
padding: 0 1rem;
}

.swagger-auth-button:disabled {
cursor: not-allowed;
opacity: 0.55;
}

.swagger-auth-button.primary {
background: #2563eb;
border-color: #1d4ed8;
color: #ffffff;
}

.swagger-auth-button.primary:not(:disabled):hover {
background: #1d4ed8;
}

.swagger-auth-button.secondary {
background: #ffffff;
border-color: #c7d8e5;
color: #1f2933;
}

.swagger-auth-button.secondary:not(:disabled):hover {
background: #eef5fb;
}

.swagger-auth-button.danger {
background: #b42318;
border-color: #912018;
color: #ffffff;
}

.swagger-auth-button.danger:not(:disabled):hover {
background: #912018;
}

.swagger-ui-host:not(.swagger-login-mode) .swagger-ui .auth-wrapper {
display: none;
}

@media (max-width: 700px) {
.swagger-auth-bar {
align-items: stretch;
flex-direction: column;
}

.swagger-auth-actions {
justify-content: flex-start;
}
}
2 changes: 1 addition & 1 deletion cda-gui/src/main.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import Layout from "./components/Layout";
import LocationSearch from "./pages/LocationSearch.jsx";

// Styles
import "@usace/groundwork/dist/style.css";
import "@usace/groundwork/dist/groundwork.css";
import "./css/index.css";
import ErrorFallback from "./pages/ErrorFallback";
import FilterExpressions from "./pages/rsql";
Expand Down
Loading
Loading