Skip to content

Commit

Permalink
Prettier fix
Browse files Browse the repository at this point in the history
  • Loading branch information
DoraCretu594118 committed Sep 10, 2024
1 parent cd89d7b commit cc639cd
Show file tree
Hide file tree
Showing 14 changed files with 63 additions and 70 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ export const getInstanceData = (instanceType: InstanceAvailableType, credentials
remoteInstanceCredentials: {
metricsParameters: MetricsParameters.manually,
schema: Schema.HTTPS,
pmm_agent_id: "",
pmm_agent_id: '',
},
};

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { FC, useCallback, useEffect, useMemo } from 'react';

import { useStyles2 } from '@grafana/ui';
import { NodesAgents } from "app/percona/add-instance/components/AddRemoteInstance/FormParts/NodesAgents/NodesAgents";
import { NodesAgents } from 'app/percona/add-instance/components/AddRemoteInstance/FormParts/NodesAgents/NodesAgents';
import { PasswordInputField } from 'app/percona/shared/components/Form/PasswordInput';
import { RadioButtonGroupField } from 'app/percona/shared/components/Form/RadioButtonGroup';
import { TextInputField } from 'app/percona/shared/components/Form/TextInput';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { FC, useCallback, useMemo } from 'react';

import { useStyles2 } from '@grafana/ui';
import { NodesAgents } from "app/percona/add-instance/components/AddRemoteInstance/FormParts/NodesAgents/NodesAgents";
import { NodesAgents } from 'app/percona/add-instance/components/AddRemoteInstance/FormParts/NodesAgents/NodesAgents';
import { PasswordInputField } from 'app/percona/shared/components/Form/PasswordInput';
import { TextInputField } from 'app/percona/shared/components/Form/TextInput';
import Validators from 'app/percona/shared/helpers/validators';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { FC, useMemo } from 'react';

import { useStyles2 } from '@grafana/ui';
import { NodesAgents } from "app/percona/add-instance/components/AddRemoteInstance/FormParts/NodesAgents/NodesAgents";
import { NodesAgents } from 'app/percona/add-instance/components/AddRemoteInstance/FormParts/NodesAgents/NodesAgents';
import { PasswordInputField } from 'app/percona/shared/components/Form/PasswordInput';
import { TextInputField } from 'app/percona/shared/components/Form/TextInput';
import Validators from 'app/percona/shared/helpers/validators';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { FC, useMemo } from 'react';

import { useStyles2 } from '@grafana/ui';
import { NodesAgents } from "app/percona/add-instance/components/AddRemoteInstance/FormParts/NodesAgents/NodesAgents";
import { NodesAgents } from 'app/percona/add-instance/components/AddRemoteInstance/FormParts/NodesAgents/NodesAgents';
import { PasswordInputField } from 'app/percona/shared/components/Form/PasswordInput';
import { TextInputField } from 'app/percona/shared/components/Form/TextInput';
import Validators from 'app/percona/shared/helpers/validators';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { FC, useMemo } from 'react';

import { useStyles2 } from '@grafana/ui';
import { PasswordInputField } from 'app/percona/shared/components/Form/PasswordInput'
import { PasswordInputField } from 'app/percona/shared/components/Form/PasswordInput';
import { TextInputField } from 'app/percona/shared/components/Form/TextInput';
import Validators from 'app/percona/shared/helpers/validators';
import { validators } from 'app/percona/shared/helpers/validatorsForm';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
export const agentTypes = {
pmmServer: 'pmm-server',
}
};
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, { FC, useCallback, useEffect, useMemo, useState } from 'react';

import { useStyles2 } from '@grafana/ui';
import { getStyles } from 'app/percona/add-instance/components/AddRemoteInstance/FormParts/FormParts.styles';
import { agentTypes } from "app/percona/add-instance/components/AddRemoteInstance/FormParts/NodesAgents/NodesAgents.constants";
import { agentTypes } from 'app/percona/add-instance/components/AddRemoteInstance/FormParts/NodesAgents/NodesAgents.constants';
import { NodesAgentsProps } from 'app/percona/add-instance/components/AddRemoteInstance/FormParts/NodesAgents/NodesAgents.types';
import { GET_NODES_CANCEL_TOKEN } from 'app/percona/inventory/Inventory.constants';
import { AgentsOption, Node, NodesOption } from 'app/percona/inventory/Inventory.types';
Expand All @@ -24,11 +24,7 @@ export const NodesAgents: FC<NodesAgentsProps> = ({ form }) => {
const [selectedAgent, setSelectedAgent] = useState<AgentsOption>();
const { nodes } = useSelector(getNodes);

const nodesOptions = useMemo(
(): NodesOption[] => nodesOptionsMapper(nodes),
[nodes]
);

const nodesOptions = useMemo((): NodesOption[] => nodesOptionsMapper(nodes), [nodes]);

const loadData = useCallback(async () => {
try {
Expand All @@ -45,21 +41,21 @@ export const NodesAgents: FC<NodesAgentsProps> = ({ form }) => {
const setNodeAndAgent = (value: NodesOption) => {
setSelectedNode(value);
if (value.agents && value.agents.length > 1) {
const pmmServerAgent = value.agents.find(item => item.key === agentTypes.pmmServer)
if(pmmServerAgent) {
const pmmServerAgent = value.agents.find((item) => item.key === agentTypes.pmmServer);
if (pmmServerAgent) {
form?.change('pmm_agent_id', pmmServerAgent);
}
} else if (value.agents && value.agents.length === 1) {
form?.change('pmm_agent_id', value.agents[0]);
}

if(selectedAgent && selectedAgent.label !== agentTypes.pmmServer) {
if (selectedAgent && selectedAgent.label !== agentTypes.pmmServer) {
form?.change('address', 'localhost');
}
}
};

useEffect(() => {
if(nodesOptions.length === 0) {
if (nodesOptions.length === 0) {
loadData();
}
// eslint-disable-next-line react-hooks/exhaustive-deps
Expand All @@ -75,7 +71,7 @@ export const NodesAgents: FC<NodesAgentsProps> = ({ form }) => {
name="node"
id="nodes-selectbox"
data-testid="nodes-selectbox"
onChange={ (event) => setNodeAndAgent(event as NodesOption)}
onChange={(event) => setNodeAndAgent(event as NodesOption)}
className={styles.selectField}
value={selectedNode}
aria-label="Nodes"
Expand All @@ -89,12 +85,11 @@ export const NodesAgents: FC<NodesAgentsProps> = ({ form }) => {
options={selectedNode?.agents || []}
name="pmm_agent_id"
data-testid="agents-selectbox"
onChange={ (event) => setSelectedAgent(event as AgentsOption)}
onChange={(event) => setSelectedAgent(event as AgentsOption)}
className={styles.selectField}
aria-label="Agents"
/>
</div>
</div>
);

}
};
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { validators } from 'app/percona/shared/helpers/validatorsForm';
import { Messages } from '../FormParts.messages';
import { getStyles } from '../FormParts.styles';
import { MainDetailsFormPartProps } from '../FormParts.types';
import { NodesAgents } from "../NodesAgents/NodesAgents";
import { NodesAgents } from '../NodesAgents/NodesAgents';

export const PostgreSQLConnectionDetails: FC<MainDetailsFormPartProps> = ({ form, remoteInstanceCredentials }) => {
const styles = useStyles2(getStyles);
Expand Down
2 changes: 0 additions & 2 deletions public/app/percona/inventory/Tabs/Agents.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,6 @@ export const Agents: FC<GrafanaRouteComponentProps<{ serviceId: string; nodeId:
const node = mappedNodes.find((s) => s.nodeId === nodeId);
const flattenAgents = useMemo(() => data.map((value) => ({ type: value.type, ...value.params })), [data]);



const columns = useMemo(
(): Array<ExtendedColumn<FlattenAgent>> => [
{
Expand Down
2 changes: 1 addition & 1 deletion public/app/percona/inventory/Tabs/Nodes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export const NodesTab = () => {
const styles = useStyles2(getStyles);
const dispatch = useAppDispatch();

const mappedNodes: Node[] = useMemo(
const mappedNodes: Node[] = useMemo(
(): Node[] => nodeFromDbMapper(nodes).sort((a, b) => a.nodeName.localeCompare(b.nodeName)),
[nodes]
);
Expand Down
80 changes: 40 additions & 40 deletions public/app/percona/inventory/__mocks__/Inventory.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,46 +29,46 @@ export const stubs: DBServiceList = {
],
};

const nodesMock =[
{
node_id: 'pmm-server',
node_type: 'generic',
node_name: 'pmm-server',
machine_id: '',
distro: '',
node_model: '',
container_id: '',
container_name: '',
address: '127.0.0.1',
region: '',
az: '',
custom_labels: {},
created_at: '2024-08-20T08:05:31.079300Z',
updated_at: '2024-08-20T08:05:31.079300Z',
status: 'STATUS_UP',
agents: [
{
agent_id: '05af4544-8fd0-4788-b841-89ed6caa9ac1',
agent_type: 'node_exporter',
status: 'AGENT_STATUS_RUNNING',
is_connected: false
},
{
agent_id: 'pmm-server',
agent_type: 'pmm-agent',
status: '',
is_connected: true
}
],
services: [
{
service_id: '291afb9b-2ae0-41d1-a173-f1a138cf1725',
service_type: 'postgresql',
service_name: 'pmm-server-postgresql'
}
]
}
];
const nodesMock = [
{
node_id: 'pmm-server',
node_type: 'generic',
node_name: 'pmm-server',
machine_id: '',
distro: '',
node_model: '',
container_id: '',
container_name: '',
address: '127.0.0.1',
region: '',
az: '',
custom_labels: {},
created_at: '2024-08-20T08:05:31.079300Z',
updated_at: '2024-08-20T08:05:31.079300Z',
status: 'STATUS_UP',
agents: [
{
agent_id: '05af4544-8fd0-4788-b841-89ed6caa9ac1',
agent_type: 'node_exporter',
status: 'AGENT_STATUS_RUNNING',
is_connected: false,
},
{
agent_id: 'pmm-server',
agent_type: 'pmm-agent',
status: '',
is_connected: true,
},
],
services: [
{
service_id: '291afb9b-2ae0-41d1-a173-f1a138cf1725',
service_type: 'postgresql',
service_name: 'pmm-server-postgresql',
},
],
},
];

export const InventoryService = jest.genMockFromModule<typeof service>(
'app/percona/inventory/Inventory.service'
Expand Down
4 changes: 2 additions & 2 deletions public/app/percona/shared/core/reducers/nodes/nodes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ const nodesSlice = createSlice({
export const fetchNodesAction = createAsyncThunk<NodeDB[], { token?: CancelToken }>(
'percona/fetchNodes',
async (params = {}) => {
const { nodes } = await InventoryService.getNodes(params.token);
return nodes;
const { nodes } = await InventoryService.getNodes(params.token);
return nodes;
}
);

Expand Down
4 changes: 2 additions & 2 deletions public/app/percona/shared/core/reducers/nodes/nodes.utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ export const nodeFromDbMapper = (nodeFromDb: NodeDB[]): Node[] => {
export const nodesOptionsMapper = (nodeFromDb: NodeDB[]): NodesOption[] =>
nodeFromDb.map((node) => {
const agents = (node.agents || [])
.filter(agent => agent.agent_type === AgentType.pmmAgent)
.map<AgentsOption>(agent => ({ value: agent.agent_id, label: agent.agent_id, key: agent.agent_type }))
.filter((agent) => agent.agent_type === AgentType.pmmAgent)
.map<AgentsOption>((agent) => ({ value: agent.agent_id, label: agent.agent_id, key: agent.agent_type }));

return {
value: node.node_id,
Expand Down

0 comments on commit cc639cd

Please sign in to comment.