|
|
@@ -46,7 +46,7 @@ export default class NamespaceSelector extends Component<PropsType, StateType> {
|
|
|
let urlParams = new URLSearchParams(queryString);
|
|
|
let urlNamespace = urlParams.get("namespace");
|
|
|
if (urlNamespace === "ALL") {
|
|
|
- urlNamespace = "all";
|
|
|
+ urlNamespace = "ALL";
|
|
|
}
|
|
|
|
|
|
let defaultNamespace = "default";
|
|
|
@@ -67,8 +67,12 @@ export default class NamespaceSelector extends Component<PropsType, StateType> {
|
|
|
}
|
|
|
);
|
|
|
this.setState({ namespaceOptions }, () => {
|
|
|
- if (urlNamespace === "" || defaultNamespace === "") {
|
|
|
- this.props.setNamespace("");
|
|
|
+ if (
|
|
|
+ urlNamespace === "" ||
|
|
|
+ defaultNamespace === "" ||
|
|
|
+ urlNamespace === "ALL"
|
|
|
+ ) {
|
|
|
+ this.props.setNamespace("ALL");
|
|
|
} else if (this.props.namespace !== defaultNamespace) {
|
|
|
this.props.setNamespace(defaultNamespace);
|
|
|
}
|
|
|
@@ -97,6 +101,11 @@ export default class NamespaceSelector extends Component<PropsType, StateType> {
|
|
|
this._isMounted = false;
|
|
|
}
|
|
|
|
|
|
+ handleSetActive = (namespace: any) => {
|
|
|
+ console.log("SELECTED", namespace);
|
|
|
+ this.props.setNamespace(namespace);
|
|
|
+ };
|
|
|
+
|
|
|
render() {
|
|
|
return (
|
|
|
<StyledNamespaceSelector>
|
|
|
@@ -105,7 +114,7 @@ export default class NamespaceSelector extends Component<PropsType, StateType> {
|
|
|
</Label>
|
|
|
<Selector
|
|
|
activeValue={this.props.namespace}
|
|
|
- setActiveValue={(namespace) => this.props.setNamespace(namespace)}
|
|
|
+ setActiveValue={this.handleSetActive}
|
|
|
options={this.state.namespaceOptions}
|
|
|
dropdownLabel="Namespace"
|
|
|
width="150px"
|