Commit 5a6fea76 authored by Jose Ivan Vargas's avatar Jose Ivan Vargas

Merge branch 'mwaw/208790-remove-unredable-clusters-from-gitlab-managed-apps-logs' into 'master'

Remove unreadable clusters for select menu

See merge request gitlab-org/gitlab!37183
parents 87fe4ebb d054d271
...@@ -112,7 +112,9 @@ export default { ...@@ -112,7 +112,9 @@ export default {
}, },
// Managed apps data // Managed apps data
[types.RECEIVE_MANAGED_APPS_DATA_SUCCESS](state, apps) { [types.RECEIVE_MANAGED_APPS_DATA_SUCCESS](state, apps) {
state.managedApps.options = apps; state.managedApps.options = apps.filter(
({ gitlab_managed_apps_logs_path }) => gitlab_managed_apps_logs_path, // eslint-disable-line babel/camelcase
);
state.managedApps.isLoading = false; state.managedApps.isLoading = false;
}, },
[types.RECEIVE_MANAGED_APPS_DATA_ERROR](state) { [types.RECEIVE_MANAGED_APPS_DATA_ERROR](state) {
......
...@@ -36,6 +36,16 @@ export const mockManagedApps = [ ...@@ -36,6 +36,16 @@ export const mockManagedApps = [
path: '/root/autodevops-deploy/-/clusters/15', path: '/root/autodevops-deploy/-/clusters/15',
gitlab_managed_apps_logs_path: '/root/autodevops-deploy/-/logs?cluster_id=15', gitlab_managed_apps_logs_path: '/root/autodevops-deploy/-/logs?cluster_id=15',
}, },
{
cluster_type: 'project_type',
enabled: true,
environment_scope: '*',
name: 'kubernetes-cluster-2',
provider_type: 'user',
status: 'connected',
path: '/root/autodevops-deploy/-/clusters/16',
gitlab_managed_apps_logs_path: null,
},
]; ];
export const mockPodName = 'production-764c58d697-aaaaa'; export const mockPodName = 'production-764c58d697-aaaaa';
......
...@@ -272,7 +272,8 @@ describe('Logs Store Mutations', () => { ...@@ -272,7 +272,8 @@ describe('Logs Store Mutations', () => {
mutations[types.RECEIVE_MANAGED_APPS_DATA_SUCCESS](state, mockManagedApps); mutations[types.RECEIVE_MANAGED_APPS_DATA_SUCCESS](state, mockManagedApps);
expect(state.managedApps.options).toEqual(mockManagedApps); expect(state.managedApps.options.length).toEqual(1);
expect(state.managedApps.options).toEqual([mockManagedApps[0]]);
expect(state.managedApps.isLoading).toBe(false); expect(state.managedApps.isLoading).toBe(false);
}); });
}); });
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment