Policies Routing Wildcard (#1041)

* Policies Routing Wildcard

Signed-off-by: Daniel Valdivia <18384552+dvaldivia@users.noreply.github.com>

* Remove Console.log

Signed-off-by: Daniel Valdivia <18384552+dvaldivia@users.noreply.github.com>
This commit is contained in:
Daniel Valdivia
2021-09-13 18:08:02 -07:00
committed by GitHub
parent a060ddbef2
commit c30f1cee92
4 changed files with 17 additions and 9 deletions

View File

@@ -27,7 +27,7 @@ var (
usersDetail = "/users/:userName+"
groups = "/groups"
iamPolicies = "/policies"
policiesDetail = "/policies/:policyName"
policiesDetail = "/policies/*"
dashboard = "/dashboard"
metrics = "/metrics"
profiling = "/profiling"

View File

@@ -253,7 +253,7 @@ const Console = ({
},
{
component: Policies,
path: "/policies/:policyName",
path: "/policies/*",
},
{
component: Policies,

View File

@@ -22,7 +22,8 @@ const Users = () => {
return (
<Router history={history}>
<Switch>
<Route path="/policies/:policyName" component={PolicyDetails} />
<Route path="/policies/" exact={true} component={ListPolicies} />
<Route path="/policies/*" component={PolicyDetails} />
<Route path="/" component={ListPolicies} />
<Route component={NotFoundPage} />
</Switch>

View File

@@ -192,9 +192,7 @@ const PolicyDetails = ({
const [userList, setUserList] = useState<string[]>([]);
const [groupList, setGroupList] = useState<string[]>([]);
const [addLoading, setAddLoading] = useState<boolean>(false);
const [policyName, setPolicyName] = useState<string>(
match.params["policyName"]
);
const [policyName, setPolicyName] = useState<string>(match.params[0]);
const [policyDefinition, setPolicyDefinition] = useState<string>("");
const [loadingPolicy, setLoadingPolicy] = useState<boolean>(true);
const [filterUsers, setFilterUsers] = useState<string>("");
@@ -227,7 +225,10 @@ const PolicyDetails = ({
const loadUsersForPolicy = () => {
if (loadingUsers) {
api
.invoke("GET", `/api/v1/policies/${policyName}/users`)
.invoke(
"GET",
`/api/v1/policies/${encodeURIComponent(policyName)}/users`
)
.then((result: any) => {
setUserList(result);
setLoadingUsers(false);
@@ -241,7 +242,10 @@ const PolicyDetails = ({
const loadGroupsForPolicy = () => {
if (loadingGroups) {
api
.invoke("GET", `/api/v1/policies/${policyName}/groups`)
.invoke(
"GET",
`/api/v1/policies/${encodeURIComponent(policyName)}/groups`
)
.then((result: any) => {
setGroupList(result);
setLoadingGroups(false);
@@ -255,7 +259,10 @@ const PolicyDetails = ({
const loadPolicyDetails = () => {
if (loadingPolicy) {
api
.invoke("GET", `/api/v1/policy?name=${policyName}`)
.invoke(
"GET",
`/api/v1/policy?name=${encodeURIComponent(policyName)}`
)
.then((result: any) => {
if (result) {
setPolicy(result);