From 225e5f3a39d17bcff491926e6b083e815b2fe3eb Mon Sep 17 00:00:00 2001 From: Alyx Holms Date: Thu, 22 Aug 2024 12:56:24 -0600 Subject: [PATCH] chore: linting fixes (#807) --- cmd/api/src/database/mocks/db.go | 15 --------------- cmd/api/src/model/unified_graph.go | 12 ++++++------ cmd/ui/src/ducks/explore/reducer.ts | 18 ++++++++++++------ cmd/ui/src/utils.ts | 10 +++++++--- .../Explore/ContextMenu/AssetGroupMenuItem.tsx | 2 +- cmd/ui/src/views/Explore/utils.ts | 10 +++++----- 6 files changed, 31 insertions(+), 36 deletions(-) diff --git a/cmd/api/src/database/mocks/db.go b/cmd/api/src/database/mocks/db.go index 5cf7ae154..259316d3a 100644 --- a/cmd/api/src/database/mocks/db.go +++ b/cmd/api/src/database/mocks/db.go @@ -1398,21 +1398,6 @@ func (mr *MockDatabaseMockRecorder) RequestCollectedGraphDataDeletion(arg0, arg1 return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RequestCollectedGraphDataDeletion", reflect.TypeOf((*MockDatabase)(nil).RequestCollectedGraphDataDeletion), arg0, arg1) } -// RequiresMigration mocks base method. -func (m *MockDatabase) RequiresMigration(arg0 context.Context) (bool, error) { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "RequiresMigration", arg0) - ret0, _ := ret[0].(bool) - ret1, _ := ret[1].(error) - return ret0, ret1 -} - -// RequiresMigration indicates an expected call of RequiresMigration. -func (mr *MockDatabaseMockRecorder) RequiresMigration(arg0 interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RequiresMigration", reflect.TypeOf((*MockDatabase)(nil).RequiresMigration), arg0) -} - // SavedQueryBelongsToUser mocks base method. func (m *MockDatabase) SavedQueryBelongsToUser(arg0 context.Context, arg1 uuid.UUID, arg2 int64) (bool, error) { m.ctrl.T.Helper() diff --git a/cmd/api/src/model/unified_graph.go b/cmd/api/src/model/unified_graph.go index 9271c7bce..62c61e477 100644 --- a/cmd/api/src/model/unified_graph.go +++ b/cmd/api/src/model/unified_graph.go @@ -75,13 +75,13 @@ func FromDAWGSNode(node *graph.Node, includeProperties bool) UnifiedNode { } return UnifiedNode{ - Label: label, - Kind: analysis.GetNodeKind(node).String(), - ObjectId: objectId, - IsTierZero: strings.Contains(systemTags, ad.AdminTierZero), + Label: label, + Kind: analysis.GetNodeKind(node).String(), + ObjectId: objectId, + IsTierZero: strings.Contains(systemTags, ad.AdminTierZero), IsOwnedObject: strings.Contains(systemTags, OwnedAssetGroupTag), - LastSeen: lastSeen, - Properties: properties, + LastSeen: lastSeen, + Properties: properties, } } diff --git a/cmd/ui/src/ducks/explore/reducer.ts b/cmd/ui/src/ducks/explore/reducer.ts index ec8c3df08..29caad78b 100644 --- a/cmd/ui/src/ducks/explore/reducer.ts +++ b/cmd/ui/src/ducks/explore/reducer.ts @@ -50,10 +50,13 @@ const graphDataReducer = (state = initialGraphDataState, action: types.GraphActi } else if (action.type === types.SAVE_RESPONSE_FOR_EXPORT) { draft.export = action.payload; } else if (action.type === types.TOGGLE_TIER_ZERO_NODE) { - let systemTags = [] + let systemTags = []; // Check if system_tags contains tags then split, else leave empty - { state.chartProps.items[action.nodeId].data.system_tags ? - systemTags = state.chartProps.items[action.nodeId].data.system_tags.split(" ") : null } + { + state.chartProps.items[action.nodeId].data.system_tags + ? (systemTags = state.chartProps.items[action.nodeId].data.system_tags.split(' ')) + : null; + } if (systemTags.includes(TIER_ZERO_TAG)) { // Remove tag systemTags.splice(systemTags.indexOf(TIER_ZERO_TAG), 1); @@ -64,10 +67,13 @@ const graphDataReducer = (state = initialGraphDataState, action: types.GraphActi draft.chartProps.items[action.nodeId].data.system_tags = systemTags.join(' '); } } else if (action.type === types.TOGGLE_OWNED_OBJECT_NODE) { - let systemTags = [] + let systemTags = []; // Check if system_tags contains tags then split, else leave empty - { state.chartProps.items[action.nodeId].data.system_tags ? - systemTags = state.chartProps.items[action.nodeId].data.system_tags.split(" ") : null } + { + state.chartProps.items[action.nodeId].data.system_tags + ? (systemTags = state.chartProps.items[action.nodeId].data.system_tags.split(' ')) + : null; + } if (systemTags.includes(OWNED_OBJECT_TAG)) { // Remove tag systemTags.splice(systemTags.indexOf(OWNED_OBJECT_TAG), 1); diff --git a/cmd/ui/src/utils.ts b/cmd/ui/src/utils.ts index 29f3a307d..db6cc945a 100644 --- a/cmd/ui/src/utils.ts +++ b/cmd/ui/src/utils.ts @@ -204,9 +204,13 @@ export const transformToFlatGraphResponse = (graph: GraphResponse) => { for (const [key, value] of Object.entries(graph.data.nodes)) { const lastSeen = getLastSeenValue(value); // Check and add needed system_tags to node - const tags = [] - { value.isTierZero ? tags.push('admin_tier_0') : null } - { value.isOwnedObject? tags.push('owned') : null } + const tags = []; + { + value.isTierZero ? tags.push('admin_tier_0') : null; + } + { + value.isOwnedObject ? tags.push('owned') : null; + } result[key] = { label: { text: value.label, diff --git a/cmd/ui/src/views/Explore/ContextMenu/AssetGroupMenuItem.tsx b/cmd/ui/src/views/Explore/ContextMenu/AssetGroupMenuItem.tsx index 70646a60b..8defc56ef 100644 --- a/cmd/ui/src/views/Explore/ContextMenu/AssetGroupMenuItem.tsx +++ b/cmd/ui/src/views/Explore/ContextMenu/AssetGroupMenuItem.tsx @@ -48,7 +48,7 @@ const AssetGroupMenuItem: FC<{ assetGroupId: number; assetGroupName: string }> = }, onSuccess: () => { if (selectedNode?.graphId) { - if(isMenuItemForTierZero) { + if (isMenuItemForTierZero) { dispatch(toggleTierZeroNode(selectedNode.graphId)); } else if (isMenuItemForOwnedObject) { dispatch(toggleOwnedObjectNode(selectedNode.graphId)); diff --git a/cmd/ui/src/views/Explore/utils.ts b/cmd/ui/src/views/Explore/utils.ts index 6bc9cd81f..40af06297 100644 --- a/cmd/ui/src/views/Explore/utils.ts +++ b/cmd/ui/src/views/Explore/utils.ts @@ -61,16 +61,16 @@ const initGraphNodes = (graph: MultiDirectedGraph, nodes: GraphNodes, themedOpti const icon = NODE_ICON[node.kind] || UNKNOWN_ICON; nodeParams.color = icon.color; nodeParams.image = icon.url || ''; - nodeParams.glyphs = [] + nodeParams.glyphs = []; // Tier zero nodes should be marked with a gem glyph if (node.isTierZero) { nodeParams.type = 'glyphs'; nodeParams.glyphs.push({ - location: GlyphLocation.TOP_RIGHT, - image: themedOptions.glyph.tierZeroGlyph.url || '', - ...themedOptions.glyph.colors, - }); + location: GlyphLocation.TOP_RIGHT, + image: themedOptions.glyph.tierZeroGlyph.url || '', + ...themedOptions.glyph.colors, + }); } if (node.isOwnedObject) { nodeParams.type = 'glyphs';