Skip to content

Fix direct css imports #42

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Nov 3, 2025
Merged

Fix direct css imports #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4f13f3
Fix direct css imports
kapantzak Nov 3, 2025
c6a3add
Fix LegacyForms
kapantzak Nov 3, 2025
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
28 changes: 11 additions & 17 deletions src/ConfigEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
import React, { ChangeEvent } from 'react';
import { LegacyForms } from '@grafana/ui';
import { InlineField, SecretInput } from '@grafana/ui';
import { DataSourcePluginOptionsEditorProps } from '@grafana/data';
import { MyDataSourceOptions, MySecureJsonData } from './shared/types';

const { SecretFormField } = LegacyForms;

interface Props extends DataSourcePluginOptionsEditorProps<MyDataSourceOptions, MySecureJsonData> {}

export const ConfigEditor: React.FC<Props> = ({ onOptionsChange, options }) => {
Expand Down Expand Up @@ -34,19 +32,15 @@ export const ConfigEditor: React.FC<Props> = ({ onOptionsChange, options }) => {
};

return (
<div className="gf-form-group">
<div className="gf-form">
<SecretFormField
isConfigured={secureJsonFields && secureJsonFields.apiToken}
value={secureJsonData?.apiToken || ''}
label="API Token"
placeholder="Your Netdata Cloud API Token"
labelWidth={6}
inputWidth={20}
onReset={onResetAPIToken}
onChange={onAPITokenChange}
/>
</div>
</div>
<InlineField label="API Token" labelWidth={20} tooltip="Your Netdata Cloud API Token">
<SecretInput
isConfigured={secureJsonFields && secureJsonFields.apiToken}
value={secureJsonData?.apiToken || ''}
placeholder="Your Netdata Cloud API Token"
width={40}
onReset={onResetAPIToken}
onChange={onAPITokenChange}
/>
</InlineField>
);
};
253 changes: 116 additions & 137 deletions src/QueryEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import React, { useState } from 'react';
import { Input, LegacyForms, Select } from '@grafana/ui';
import { Input, InlineField, InlineFieldRow, Select, useStyles2 } from '@grafana/ui';
import { QueryEditorProps, SelectableValue } from '@grafana/data';
import { css } from '@emotion/css';
import { DataSource } from './datasource';
import { MyDataSourceOptions, MyQuery } from './shared/types';
import { useFetchSpaces } from 'shared/hooks/useFetchSpaces';
import './styles.css';
import { useFetchRooms } from 'shared/hooks/useFetchRooms';
import { useFetchContexts } from 'shared/hooks/useFetchContexts';
import { useFetchNodes } from 'shared/hooks/useFetchNodes';
Expand All @@ -15,9 +15,14 @@ import PubSub from 'pubsub-js';

type Props = QueryEditorProps<DataSource, MyQuery, MyDataSourceOptions>;

const { FormField } = LegacyForms;
const getStyles = () => ({
mt: css`
margin-top: 8px;
`,
});

const QueryEditor: React.FC<Props> = ({ datasource, query, range, onChange, onRunQuery }) => {
const styles = useStyles2(getStyles);
const { baseUrl } = datasource;
const from = range!.from.valueOf();
const to = range!.to.valueOf();
Expand Down Expand Up @@ -266,143 +271,117 @@ const QueryEditor: React.FC<Props> = ({ datasource, query, range, onChange, onRu

return (
<>
<div className="flex mt">
<FormField
label="Space*"
inputEl={
<Select options={spaces} value={selectedSpace} onChange={onSpaceIdChange} allowCustomValue isSearchable />
}
/>

<FormField
label="Room*"
inputEl={
<Select options={rooms} value={selectedRoom} onChange={onRoomIdChange} allowCustomValue isSearchable />
}
/>
</div>

<div className="mt">
<FormField
label="Nodes"
tooltip="No selected Nodes means 'All Nodes' from the Room"
inputEl={
<Select
options={nodeList}
value={selectedNodes}
onChange={onNodesChange}
allowCustomValue
isSearchable
isMulti
/>
}
/>
</div>
<div className="flex mt">
<FormField
label="Context*"
inputEl={
<Select
options={contexts}
value={selectedContext}
onChange={onContextIdChange}
allowCustomValue
isSearchable
/>
}
/>

<FormField
label="Dimensions"
inputEl={
<Select
options={allDimensions}
value={selectedDimensions}
onChange={onDimensionsChange}
allowCustomValue
isSearchable
isMulti
/>
}
/>
</div>

<div className="flex mt">
<FormField
label="Grouping by*"
inputEl={
<Select
options={groupingByList}
value={selectedGroupBy}
onChange={onGroupByChange}
allowCustomValue
isSearchable
/>
}
/>
<FormField
<InlineFieldRow className={styles.mt}>
<InlineField label="Space*" grow>
<Select options={spaces} value={selectedSpace} onChange={onSpaceIdChange} allowCustomValue isSearchable />
</InlineField>

<InlineField label="Room*" grow>
<Select options={rooms} value={selectedRoom} onChange={onRoomIdChange} allowCustomValue isSearchable />
</InlineField>
</InlineFieldRow>

<InlineFieldRow className={styles.mt}>
<InlineField label="Nodes" tooltip="No selected Nodes means 'All Nodes' from the Room" grow>
<Select
options={nodeList}
value={selectedNodes}
onChange={onNodesChange}
allowCustomValue
isSearchable
isMulti
/>
</InlineField>
</InlineFieldRow>

<InlineFieldRow className={styles.mt}>
<InlineField label="Context*" grow>
<Select
options={contexts}
value={selectedContext}
onChange={onContextIdChange}
allowCustomValue
isSearchable
/>
</InlineField>

<InlineField label="Dimensions" grow>
<Select
options={allDimensions}
value={selectedDimensions}
onChange={onDimensionsChange}
allowCustomValue
isSearchable
isMulti
/>
</InlineField>
</InlineFieldRow>

<InlineFieldRow className={styles.mt}>
<InlineField label="Grouping by*" grow>
<Select
options={groupingByList}
value={selectedGroupBy}
onChange={onGroupByChange}
allowCustomValue
isSearchable
/>
</InlineField>

<InlineField
label="Grouping function*"
tooltip="The aggregation function to be applied when multiple data sources exists for one node (multiple instances). This is disabled when not applicable."
labelWidth={10}
inputEl={
<Select
disabled={!isGroupFunctionAvailable()}
options={Methods}
value={selectedMethod}
onChange={onMethodChange}
allowCustomValue
isSearchable
/>
}
/>
<FormField
label="Aggregation function*"
tooltip="Aggregation function over time"
labelWidth={11}
inputEl={
<Select
options={Aggreagations}
value={selectedAggregations}
onChange={onAggreagationChange}
allowCustomValue
isSearchable
/>
}
/>
</div>

<div className="flex mt">
<FormField
label="Filter by"
inputEl={
<Select
options={filterList}
value={selectedFilter}
onChange={onFilterByChange}
allowCustomValue
isSearchable
/>
}
/>
<FormField
label="Value"
labelWidth={8}
inputEl={
<Select
options={filterByValues}
value={selectedFilterValue}
onChange={onFilterValueChange}
allowCustomValue
isSearchable
/>
}
/>
</div>

<div className="flex mt">
<FormField label="Unit" labelWidth={8} inputEl={<Input value={units} disabled />} />
grow
>
<Select
disabled={!isGroupFunctionAvailable()}
options={Methods}
value={selectedMethod}
onChange={onMethodChange}
allowCustomValue
isSearchable
/>
</InlineField>

<InlineField label="Aggregation function*" tooltip="Aggregation function over time" grow>
<Select
options={Aggreagations}
value={selectedAggregations}
onChange={onAggreagationChange}
allowCustomValue
isSearchable
/>
</InlineField>
</InlineFieldRow>

<InlineFieldRow className={styles.mt}>
<InlineField label="Filter by" grow>
<Select
options={filterList}
value={selectedFilter}
onChange={onFilterByChange}
allowCustomValue
isSearchable
/>
</InlineField>

<InlineField label="Value" grow>
<Select
options={filterByValues}
value={selectedFilterValue}
onChange={onFilterValueChange}
allowCustomValue
isSearchable
/>
</InlineField>
</InlineFieldRow>

<InlineFieldRow className={styles.mt}>
<InlineField label="Unit" grow>
<Input value={units} disabled />
</InlineField>
<div />
</div>
</InlineFieldRow>
</>
);
};
Expand Down
14 changes: 0 additions & 14 deletions src/styles.css
View file
Open in desktop

This file was deleted.

Loading
Loading