Skip to content

Proper error message why carddata faild implemented for druid #55

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

Open
PraveenCuebook wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Proper error message why carddata faild implemented for druid #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5e1ba00
Proper error message why carddata faild implemented for druid
PraveenCuebook Mar 1, 2022
846870a
Merge branch 'main' into uiFixes
PraveenCuebook Mar 1, 2022
52404e3
Text out of card is fixed
PraveenCuebook Mar 1, 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
219 changes: 110 additions & 109 deletions api/cueSearch/tests/test_elasticSearch_indexing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,115 +455,116 @@ def testFindNonGlobalDimensionSuggestionResult(client, mocker):
################################ Delete all indexes ##############


# @pytest.mark.django_db(transaction=True)
# def testFindNonGlobalDimensionResultData(client, mocker):
# """Method to test non global dimension index"""
# ESIndexingUtils.deleteAllIndex()

# connection = mixer.blend("dataset.connection")
# testDataset = mixer.blend(
# "dataset.dataset",
# name="orders",
# id=1,
# dimensions='["Brand", "Color", "State"]',
# metrics='["Orders", "OrderAmount", "OrderQuantity"]',
# granularity="day",
# timestampColumn="TestDate",
# sql="Select * from testTable",
# )
# mockResponse = mocker.patch(
# "cueSearch.elasticSearch.elastic_search_indexing.ESIndexingUtils.runAllIndexDimension",
# new=mock.MagicMock(autospec=True, return_value=True),
# )
# mockResponse.start()
# path = reverse("createDataset")
# data = {
# "name": "demo_dataset",
# "sql": "SELECT * from TEST_TABLE",
# "connectionId": connection.id,
# "metrics": ["Amount", "Quantity"],
# "dimensions": ["Category", "Region"],
# "timestamp": "CreatedAt",
# "granularity": "day",
# "isNonRollup": False,
# }
# response = client.post(path, data=data, content_type="application/json")

# # create dimension for testing
# dataset = Dataset.objects.get(id=1)
# mockResponse.start()
# path = reverse("globalDimensionCreate")
# gd_data = {
# "name": "test",
# "dimensionalValues": [
# {
# "datasetId": dataset.id,
# "dataset": "Returns",
# "dimension": "WarehouseCode",
# }
# ],
# }
# response = client.post(path, gd_data, content_type="application/json")
# assert response.data["success"] == True
# assert response.status_code == 200

# globalDimsId = GlobalDimensionServices.getGlobalDimensions()
# globalDimensionId = globalDimsId.data[0]["values"][0]["id"]

# # Publishing global dimension by id
# path = reverse("pubGlobalDimension")
# payload = {"id": globalDimensionId, "published": True}
# response = client.post(path, payload)
# mockResponse.stop()
# listToIndex = [
# {"dataset": "Test data", "datasetId": 1, "dimension": "Brand"},
# {"dataset": "Test data", "datasetId": 1, "dimension": "WarehouseCode"},
# ]
# res = {"success": True, "data": listToIndex}

# mockResponse = mocker.patch(
# "cueSearch.services.globalDimension.GlobalDimensionServices.nonGlobalDimensionForIndexing",
# new=mock.MagicMock(autospec=True, return_value=res),
# )
# mockResponse.start()
# ESIndexingUtils.indexNonGlobalDimensionsData()
# mockResponse.stop()

# expectedResults = [
# {
# "value": "TestData",
# "dimension": "Brand",
# "globalDimensionName": "Test data_Brand",
# "user_entity_identifier": "Test data_Brand",
# "id": "Brand_TestData_1",
# "dataset": "Test data",
# "datasetId": testDataset.id,
# "type": "DATASETDIMENSION",
# },
# {
# "value": "TestData",
# "dimension": "WarehouseCode",
# "globalDimensionName": "Test data_WarehouseCode",
# "user_entity_identifier": "Test data_WarehouseCode",
# "id": "WarehouseCode_TestData_1",
# "dataset": "Test data",
# "datasetId": testDataset.id,
# "type": "DATASETDIMENSION",
# },
# ]
# query = "TestData"
# result = ESQueryingUtils.findNonGlobalDimensionResults(query=query)
# count = 0
# while not result:
# count += 1
# result = ESQueryingUtils.findNonGlobalDimensionResults(query=query)

# if count == 10:
# result = []
# return result

# assert result == expectedResults
# ################################ Delete all indexes ##############
@pytest.mark.django_db(transaction=True)
def testFindNonGlobalDimensionResultData(client, mocker):
"""Method to test non global dimension index"""
ESIndexingUtils.deleteAllIndex()

connection = mixer.blend("dataset.connection")
testDataset = mixer.blend(
"dataset.dataset",
name="orders",
id=1,
dimensions='["Brand", "Color", "State"]',
metrics='["Orders", "OrderAmount", "OrderQuantity"]',
granularity="day",
timestampColumn="TestDate",
sql="Select * from testTable",
)
mockResponse = mocker.patch(
"cueSearch.elasticSearch.elastic_search_indexing.ESIndexingUtils.runAllIndexDimension",
new=mock.MagicMock(autospec=True, return_value=True),
)
mockResponse.start()
path = reverse("createDataset")
data = {
"name": "demo_dataset",
"sql": "SELECT * from TEST_TABLE",
"connectionId": connection.id,
"metrics": ["Amount", "Quantity"],
"dimensions": ["Category", "Region"],
"timestamp": "CreatedAt",
"granularity": "day",
"isNonRollup": False,
}
response = client.post(path, data=data, content_type="application/json")

# create dimension for testing
dataset = Dataset.objects.get(id=1)
mockResponse.start()
path = reverse("globalDimensionCreate")
gd_data = {
"name": "test",
"dimensionalValues": [
{
"datasetId": dataset.id,
"dataset": "Returns",
"dimension": "WarehouseCode",
}
],
}
response = client.post(path, gd_data, content_type="application/json")
assert response.data["success"] == True
assert response.status_code == 200

globalDimsId = GlobalDimensionServices.getGlobalDimensions()
globalDimensionId = globalDimsId.data[0]["values"][0]["id"]

# Publishing global dimension by id
path = reverse("pubGlobalDimension")
payload = {"id": globalDimensionId, "published": True}
response = client.post(path, payload)
mockResponse.stop()
listToIndex = [
{"dataset": "Test data", "datasetId": 1, "dimension": "Brand"},
{"dataset": "Test data", "datasetId": 1, "dimension": "WarehouseCode"},
]
res = {"success": True, "data": listToIndex}

mockResponse = mocker.patch(
"cueSearch.services.globalDimension.GlobalDimensionServices.nonGlobalDimensionForIndexing",
new=mock.MagicMock(autospec=True, return_value=res),
)
mockResponse.start()
ESIndexingUtils.indexNonGlobalDimensionsData()
mockResponse.stop()

expectedResults = [
{
"value": "TestData",
"dimension": "Brand",
"globalDimensionName": "Test data_Brand",
"user_entity_identifier": "Test data_Brand",
"id": "Brand_TestData_1",
"dataset": "Test data",
"datasetId": testDataset.id,
"type": "DATASETDIMENSION",
},
{
"value": "TestData",
"dimension": "WarehouseCode",
"globalDimensionName": "Test data_WarehouseCode",
"user_entity_identifier": "Test data_WarehouseCode",
"id": "WarehouseCode_TestData_1",
"dataset": "Test data",
"datasetId": testDataset.id,
"type": "DATASETDIMENSION",
},
]
query = "TestData"
result = ESQueryingUtils.findNonGlobalDimensionResults(query=query)
count = 0
while not result:
count += 1
result = ESQueryingUtils.findNonGlobalDimensionResults(query=query)

if count == 10:
result = []
return result

assert result == expectedResults

################################ Delete all indexes ##############


def testRunAllIndexing(client, mocker):
Expand Down
1 change: 0 additions & 1 deletion api/dataset/services/datasets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ def getDatasetData(params: dict):
res = ApiResponse("Error in fetching data")
try:
dataset = Dataset.objects.get(id=params["datasetId"])
# params["sql"] = params["sql"] + "some went wrong"
dataDf = Data.fetchDatasetDataframe(dataset, params["sql"])
if isinstance(dataDf, str):
res.update(False, "Error occured while fetching data", dataDf)
Expand Down
4 changes: 2 additions & 2 deletions ui/src/components/Search/Card/CardSnippet/style.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
margin-bottom: 5px;
border-radius: 10px;
background: white;
height: 154px;
height: auto;
padding: 10px;

.chartSnippet {
Expand All @@ -81,7 +81,7 @@
margin: 0;
background: #aaaaaa;
border-radius: 5px;
height: 134px;
height: 100%;
/*border: 1px solid #aaaaaa;*/
overflow: hidden;
background: white;
Expand Down
30 changes: 20 additions & 10 deletions ui/src/components/Search/Card/DataDisplay/Chart/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
G2,
Guide,
} from "bizcharts";
import ErrorDisplayCard from "../../Error/ErrorDisplay";
const { Html } = Guide;

track(false);
Expand All @@ -37,6 +38,7 @@ class ChartCard extends React.Component {

render() {
const cardData = this.props.cardData;
const errorSqlMessage = this.props.errorMessage
const showPercentageButton = cardData && cardData.rowsTotal;
let data = [];
let chartMetaData = {};
Expand Down Expand Up @@ -126,17 +128,25 @@ class ChartCard extends React.Component {
/>
{geomElements}
</Chart>
) : (
<div
className={`${style.loadingDiv} pt-5 mt-2`}
style={{ height: height }}
>
<div>
<i className="fa fa-exclamation-triangle"></i>
<p>No Data</p>
) : errorSqlMessage ? <ErrorDisplayCard

loadingData={this.props.loadingData}
errorMessage={errorSqlMessage}

/> :

(
<div
className={`${style.loadingDiv} pt-5 mt-2`}
style={{ height: height }}
>
<div>
<i className="fa fa-exclamation-triangle"></i>
<p>No Data</p>
</div>
</div>
</div>
);
);


return (
<div>
Expand Down
35 changes: 24 additions & 11 deletions ui/src/components/Search/Card/DataDisplay/Table/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
import React, { useState, useEffect, useRef } from "react";
import { message, Select, Table } from "antd";
import { message, Select, Table, Button } from "antd";
import _ from "lodash";
import { calculateColumnsWidth } from "components/Utils/columnWidthHelper";
import Loader from "components/Utils/Loader";
import style from "./style.module.scss";
import ErrorDisplayCard from "../../Error/ErrorDisplay.js"

export default function TableCard(props) {
const tableData = props.cardData;
const loadingTableData = props.loadingData;
const errorSqlMessage = props.errorMessage
const columns =
!_.isEmpty(tableData) &&
Object.keys(tableData[0]).map((col) => {
Expand All @@ -25,17 +27,28 @@ export default function TableCard(props) {
};

const dataTable = (
<Table
className={style.antdTable}
columns={columns}
dataSource={tableData ? styledTable.source : tableData}
pagination={false}
size="xs"
bordered={true}
scroll={tableScroll}
/>
);

errorSqlMessage ? (
<div>
< ErrorDisplayCard
loadingData={loadingTableData}
errorMessage={errorSqlMessage}

/>
</div >
)
:

<Table
className={style.antdTable}
columns={columns}
dataSource={tableData ? styledTable.source : tableData}
pagination={false}
size="xs"
bordered={true}
scroll={tableScroll}
/>
);
return (
<div className="cardTable">
{loadingTableData ? (
Expand Down
Loading