diff --git a/apps/dashboard/src/main/java/com/akto/action/ApiCollectionsAction.java b/apps/dashboard/src/main/java/com/akto/action/ApiCollectionsAction.java index 2501d5cee5..c0f931b9f2 100644 --- a/apps/dashboard/src/main/java/com/akto/action/ApiCollectionsAction.java +++ b/apps/dashboard/src/main/java/com/akto/action/ApiCollectionsAction.java @@ -767,7 +767,7 @@ public String fetchCustomerEndpoints(){ List apiCollectionIds; - private ENV_TYPE envType; + private String envType; public String updateEnvType(){ try { @@ -942,7 +942,7 @@ public void setRedacted(boolean redacted) { this.redacted = redacted; } - public void setEnvType(ENV_TYPE envType) { + public void setEnvType(String envType) { this.envType = envType; } diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/shared/treeView/PrettifyChildren.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/shared/treeView/PrettifyChildren.jsx index dec2e3f906..eec2291e5c 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/shared/treeView/PrettifyChildren.jsx +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/shared/treeView/PrettifyChildren.jsx @@ -68,7 +68,7 @@ function PrettifyChildren({ data, headers }) { let ids = c.hasOwnProperty('apiCollectionIds') ? c['apiCollectionIds'] : [c.id]; let collectionObj = transform.convertToPrettifyData(c); collectionObj.urlsCount = c.urlsCount; - collectionObj.envTypeComp = c.envType ? {func.toSentenceCase(c.envType)} : null; + collectionObj.envTypeComp = c.envType ? {c.envType} : null; let isChildOpen = isLevelVisible(c.level); collectionObj.displayNameComp = diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/ApiCollections.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/ApiCollections.jsx index f620e47144..44aa52c22a 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/ApiCollections.jsx +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/ApiCollections.jsx @@ -1,6 +1,6 @@ import PageWithMultipleCards from "../../../components/layouts/PageWithMultipleCards" -import { Text, Button, IndexFiltersMode, Box, Badge, Popover, ActionList, Link, Tooltip, Modal, Checkbox, LegacyCard, ResourceList, ResourceItem, Avatar, Filters, Card, HorizontalStack, Icon} from "@shopify/polaris" -import { HideMinor, ViewMinor,FileMinor } from '@shopify/polaris-icons'; +import { Text, Button, IndexFiltersMode, Box, Badge, Popover, ActionList, ResourceItem, Avatar, HorizontalStack, Icon, TextField, Tooltip} from "@shopify/polaris" +import { HideMinor, ViewMinor,FileMinor, FileFilledMinor } from '@shopify/polaris-icons'; import api from "../api" import dashboardApi from "../../dashboard/api" import settingRequests from "../../settings/api" @@ -216,6 +216,8 @@ function ApiCollections() { const [normalData, setNormalData] = useState([]) const [treeView, setTreeView] = useState(false); const [moreActions, setMoreActions] = useState(false); + const [textFieldActive, setTextFieldActive] = useState(false); + const [customEnv,setCustomEnv] = useState('') // const dummyData = dummyJson; @@ -627,14 +629,28 @@ function ApiCollections() { autofocusTarget="first-node" > - + +