Skip to content
This repository was archived by the owner on Sep 12, 2024. It is now read-only.

added count column for Druid DS #981

Merged
merged 2 commits into from
Jun 8, 2022
Merged

added count column for Druid DS #981

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0641ec
added count column for Druid DS
Jun 8, 2022
91586ef
changed edit form for druid
Jun 8, 2022
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
129 changes: 121 additions & 8 deletions frontend/src/components/KpiExplorerForm/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,8 @@ const KpiExplorerForm = ({ onboarding, setModal, setText }) => {
addfilter: [],
dimensions: [],
dashboardNameList: [],
dashboardName: ''
dashboardName: '',
count_column: ''
});

const [editedFormData, setEditedFormData] = useState({});
Expand All @@ -106,7 +107,8 @@ const KpiExplorerForm = ({ onboarding, setModal, setText }) => {
datetimecolumns: false,
dimension: false,
dashboardName: false,
dashboardNameList: false
dashboardNameList: false,
count_column: false
});

const [dataset, setDataset] = useState({ value: 'Table', label: 'Table' });
Expand All @@ -116,6 +118,7 @@ const KpiExplorerForm = ({ onboarding, setModal, setText }) => {
tabledimension: false
});

const [hasDruidDropDown, setHasDruidDropDown] = useState(false);
const [datasourceid, setDataSourceId] = useState('');
const [isOpen, setIsOpen] = useState(false);

Expand Down Expand Up @@ -200,6 +203,7 @@ const KpiExplorerForm = ({ onboarding, setModal, setText }) => {
obj['datetimecolumns'] = kpiEditData?.datetime_column || '';
obj['addfilter'] = kpiEditData?.filters || [];
obj['dimensions'] = kpiEditData?.dimensions || [];
obj['count_column'] = kpiEditData?.count_column || '';
let arr = [];
kpiEditData?.dashboards &&
kpiEditData?.dashboards.map((data) =>
Expand All @@ -218,6 +222,14 @@ const KpiExplorerForm = ({ onboarding, setModal, setText }) => {
kpiEditData?.data_source !== null &&
kpiEditData?.data_source !== undefined
) {
if (option && option.datasource) {
const foundIndex = option.datasource.find((item) => {
return +kpiEditData.data_source === +item.id;
});
if (foundIndex && foundIndex.value === 'Druid' && !hasDruidDropDown) {
setHasDruidDropDown(true);
}
}
setDataSourceId(kpiEditData?.data_source);
if (kpiEditData?.schema_name) {
dispatchGetTableListOnSchema({
Expand Down Expand Up @@ -272,6 +284,16 @@ const KpiExplorerForm = ({ onboarding, setModal, setText }) => {
label: item.name,
value: item.name
});
if (
hasDruidDropDown &&
item.name === 'count' &&
formdata.count_column === ''
) {
setFormdata({
...formdata,
count_column: item.name
});
}
});
} else {
arr = [];
Expand Down Expand Up @@ -459,6 +481,12 @@ const KpiExplorerForm = ({ onboarding, setModal, setText }) => {
};

const formOption = (e) => {
//Add extra dropDown column for Druid
if (e.value === 'Druid' && !hasDruidDropDown) {
setHasDruidDropDown(true);
} else {
setHasDruidDropDown(false);
}
setDataSourceId(e.id);
setFormdata({
...formdata,
Expand All @@ -470,7 +498,8 @@ const KpiExplorerForm = ({ onboarding, setModal, setText }) => {
aggregate: '',
datetimecolumns: '',
dimensions: [],
dashboardNameList: []
dashboardNameList: [],
count_column: ''
});
setTableAdditional({
...tableAdditional,
Expand Down Expand Up @@ -645,7 +674,8 @@ const KpiExplorerForm = ({ onboarding, setModal, setText }) => {
metriccolumns: '',
aggregate: '',
datetimecolumns: '',
dimensions: []
dimensions: [],
count_column: ''
});
setEditedFormData({
...editedFormData,
Expand All @@ -669,7 +699,8 @@ const KpiExplorerForm = ({ onboarding, setModal, setText }) => {
metriccolumns: '',
aggregate: '',
datetimecolumns: '',
dimensions: []
dimensions: [],
count_column: ''
});
setEditedFormData({
...editedFormData,
Expand Down Expand Up @@ -700,6 +731,16 @@ const KpiExplorerForm = ({ onboarding, setModal, setText }) => {
label: value.name,
value: value.name
});
if (
hasDruidDropDown &&
value.name === 'count' &&
formdata.count_column === ''
) {
setFormdata({
...formdata,
count_column: value.name
});
}
}
setOption({ ...option, metricOption: optionArr });
}
Expand Down Expand Up @@ -732,7 +773,8 @@ const KpiExplorerForm = ({ onboarding, setModal, setText }) => {
dimensions: [],
tablename: '',
schemaName: '',
dashboardNameList: []
dashboardNameList: [],
count_column: ''
});
setEditedFormData({
...editedFormData,
Expand Down Expand Up @@ -801,6 +843,14 @@ const KpiExplorerForm = ({ onboarding, setModal, setText }) => {
};
});
}
if (hasDruidDropDown && formdata.count_column === '') {
setErrorMsg((prev) => {
return {
...prev,
count_column: true
};
});
}
if (formdata.aggregate === '') {
setErrorMsg((prev) => {
return {
Expand Down Expand Up @@ -851,7 +901,8 @@ const KpiExplorerForm = ({ onboarding, setModal, setText }) => {
formdata.metriccolumns &&
formdata.aggregate &&
formdata.datetimecolumns) !== '' &&
formdata.dashboardNameList.length !== 0
formdata.dashboardNameList.length !== 0 &&
(hasDruidDropDown ? formdata.count_column : true)
) {
const kpiInfo = {
name: formdata.kpiname,
Expand All @@ -869,6 +920,10 @@ const KpiExplorerForm = ({ onboarding, setModal, setText }) => {
dashboards: formdata.dashboardNameList.map((el) => el.value)
};

if (hasDruidDropDown) {
kpiInfo['count_column'] = formdata.count_column;
}

if (data[2] === 'edit' && present) {
if (Object.keys(needForCleanup)?.length) {
setEditModalOpen(true);
Expand Down Expand Up @@ -897,7 +952,8 @@ const KpiExplorerForm = ({ onboarding, setModal, setText }) => {
metriccolumns: '',
aggregate: '',
datetimecolumns: '',
dimensions: []
dimensions: [],
count_column: ''
});
};
const closeModal = () => {
Expand Down Expand Up @@ -1262,6 +1318,63 @@ const KpiExplorerForm = ({ onboarding, setModal, setText }) => {
</div>
) : null}
</div>

{hasDruidDropDown && (
<div className="form-group">
<label>Count Column *</label>
<Select
options={
option.metricOption && option.metricOption.length !== 0
? option.metricOption
: []
}
value={
formdata.count_column !== '' && {
label: formdata.count_column,
value: formdata.count_column
}
}
isDisabled={
data[2] === 'edit' ? editableStatus('count_column') : false
}
classNamePrefix="selectcategory"
placeholder="Select Count Column"
noOptionsMessage={() => {
return tableInfoLoading || kpiFieldLoading
? 'Loading...'
: 'No Options';
}}
onChange={(e) => {
setFormdata({ ...formdata, count_column: e.value });
setEditedFormData({
...editedFormData,
count_column: e.value
});
if (kpiEditData?.count_column !== e.value) {
setNeedForCleanUp({
...needForCleanup,
count_column: true
});
} else {
const { count_column, ...newItems } = needForCleanup;
setNeedForCleanUp(newItems);
}
setErrorMsg((prev) => {
return {
...prev,
count_column: false
};
});
}}
/>
{errorMsg.count_column === true ? (
<div className="connection__fail">
<p>Select Metric Columns</p>
</div>
) : null}
</div>
)}

<div className="form-group">
<label>Aggregate by *</label>
<Select
Expand Down