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

Fix domain search page crash for crossRegion environments #532

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion client/containers/active-status/getters.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ const getters = {

const domainNamespace = domainHash[domainName];

if (!crossRegion || !isReady) {
if (!domainName || !crossRegion || !isReady) {
return [];
}

Expand Down
55 changes: 55 additions & 0 deletions client/containers/active-status/getters.spec.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
// Copyright (c) 2021-2023 Uber Technologies Inc.
//
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.

import { ROUTE_PARAMS_DOMAIN } from '../route/getter-types';
import {
CROSS_REGION,
CROSS_REGION_CLUSTER_ORIGIN_LIST,
} from '../cross-region/getter-types';
import { DOMAIN_HASH, DOMAIN_IS_READY } from '../domain/getter-types';
import activeStatusGetterFns from './getters';
import { ACTIVE_STATUS_CLUSTER_LIST } from './getter-types';
import { initGetters } from '~test';

describe('Active status getters', () => {
describe('when calling getters[ACTIVE_STATUS_CLUSTER_LIST]', () => {
it('should return empty array if its dynamic dependent getters returned Nil', () => {
const dependentGetterNames = [
CROSS_REGION_CLUSTER_ORIGIN_LIST,
CROSS_REGION,
ROUTE_PARAMS_DOMAIN,
];

dependentGetterNames.forEach(getterName => {
const getterFns = {
...activeStatusGetterFns,
[getterName]: () => null,
[DOMAIN_IS_READY]: () => true,
[DOMAIN_HASH]: () => ({}),
};
const getters = initGetters({ getterFns });
const output = getters[ACTIVE_STATUS_CLUSTER_LIST];

expect(output).toEqual([]);
});
});
});
});
13 changes: 11 additions & 2 deletions client/containers/domain/connector.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,18 @@ const gettersToProps = {
const lifecycle = {
mounted: ({ dispatch }) => dispatch(DOMAIN_ON_MOUNT),
updated({ dispatch, state }) {
const urlParamClusterName = this.clusterName;
const urlParams = state.route.params;
const routeSupportsClusterNameParam = urlParams?.hasOwnProperty(
'clusterName'
);

if (!urlParamClusterName && this.activeCluster?.clusterName) {
const hasClusterNameParam = Boolean(urlParams.clusterName);

if (
routeSupportsClusterNameParam &&
!hasClusterNameParam &&
this.activeCluster?.clusterName
) {
// in some cases users have urls that are generic (with no cluster name specified) those are used when we want to auto redirect the user to one of the clusters by default without carring about which cluster.
dispatch(ROUTE_REPLACE, {
name: state.route.name,
Expand Down
2 changes: 0 additions & 2 deletions client/test/domain.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,6 @@ describe('Domain ', () => {
.startingAt('/domains/ci-test')
.go();

const configEl = await testEl.waitUntilExists('section.domain');

return [testEl, scenario];
}

Expand Down
Loading