From b5802f03df202a126042d82ec0d66a12202b47fa Mon Sep 17 00:00:00 2001 From: Vincent Fiduccia Date: Sun, 4 Oct 2020 02:14:28 -0700 Subject: [PATCH 1/2] Less subscribe logging --- plugins/steve/subscribe.js | 14 +++++++------- store/type-map.js | 1 - 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/plugins/steve/subscribe.js b/plugins/steve/subscribe.js index 5b4adced04..558357629a 100644 --- a/plugins/steve/subscribe.js +++ b/plugins/steve/subscribe.js @@ -163,7 +163,7 @@ export const actions = { const promises = []; for ( const entry of state.started.slice() ) { - console.info('Reconnect', entry.type, entry.namespace, entry.id, entry.selector); // eslint-disable-line no-console + console.info('Reconnect', entry); // eslint-disable-line no-console if ( getters.schemaFor(entry.type) ) { commit('setWatchStopped', entry); delete entry.revision; @@ -179,7 +179,7 @@ export const actions = { resourceType, namespace, id, selector } = params; - console.info('Resource resync for', resourceType, namespace, id, selector); // eslint-disable-line no-console + console.info('Resource resync for', params); // eslint-disable-line no-console const opt = { force: true, forceWatch: true }; @@ -227,7 +227,7 @@ export const actions = { }, async opened({ commit, dispatch, state }, event) { - console.info('WebSocket Opened'); // eslint-disable-line no-console + // console.info('WebSocket Opened'); // eslint-disable-line no-console const socket = event.currentTarget; this.$socket = socket; @@ -262,7 +262,7 @@ export const actions = { }, closed({ state }, event) { - console.warn('WebSocket Closed'); // eslint-disable-line no-console + // console.warn('WebSocket Closed'); // eslint-disable-line no-console clearTimeout(state.queueTimer); state.queueTimer = null; }, @@ -292,7 +292,7 @@ export const actions = { }, 'ws.resource.start'({ commit }, msg) { - console.info('Resource start:', msg.resourceType, msg.id, msg.selector); // eslint-disable-line no-console + // console.info('Resource start:', msg); // eslint-disable-line no-console commit('setWatchStarted', { type: msg.resourceType, namespace: msg.namespace, @@ -302,7 +302,7 @@ export const actions = { }, 'ws.resource.error'({ commit, dispatch }, msg) { - console.warn('Resource error for', msg.resourceType, ':', msg.data.error); // eslint-disable-line no-console + // console.warn('Resource error for', msg.resourceType, ':', msg.data.error); // eslint-disable-line no-console const err = msg.data?.error?.toLowerCase(); if ( err.includes('watch not allowed') ) { @@ -324,7 +324,7 @@ export const actions = { selector: msg.selector }; - console.warn('Resource stop:', type, msg.namespace, msg.id, msg.selector); // eslint-disable-line no-console + // console.warn('Resource stop:', msg); // eslint-disable-line no-console if ( getters['schemaFor'](type) && getters['watchStarted'](obj) ) { // Try reconnecting once diff --git a/store/type-map.js b/store/type-map.js index 8c5d26cfa9..a876ebb2b8 100644 --- a/store/type-map.js +++ b/store/type-map.js @@ -840,7 +840,6 @@ export const getters = { } try { - console.log('Looking for edit for ', type); require.resolve(`@/edit/${ type }`); cache[type] = true; } catch (e) { From 5766a5cef10aed2c8d491bf90f360afa648c0958 Mon Sep 17 00:00:00 2001 From: Vincent Fiduccia Date: Sun, 4 Oct 2020 16:39:04 -0700 Subject: [PATCH 2/2] Disable fleet cluster delete --- models/fleet.cattle.io.cluster.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/models/fleet.cattle.io.cluster.js b/models/fleet.cattle.io.cluster.js index 3332e2a362..4a79e3242e 100644 --- a/models/fleet.cattle.io.cluster.js +++ b/models/fleet.cattle.io.cluster.js @@ -74,6 +74,10 @@ export default { }; }, + canDelete() { + return false; + }, + nameDisplay() { return this.metadata?.labels?.[FLEET_LABELS.CLUSTER_DISPLAY_NAME] || this.metadata?.name || this.id; },