diff --git a/ui/src/components/ImportButton/import-current-button.jsx b/ui/src/components/ImportButton/import-current-button.jsx index ef49ad28..d7c8b880 100644 --- a/ui/src/components/ImportButton/import-current-button.jsx +++ b/ui/src/components/ImportButton/import-current-button.jsx @@ -8,8 +8,8 @@ const { useImportCurrentDataMutation } = modelsApiSlice; function ImportCurrentDatasetButton({ type = 'primary-light' }) { const { uuid: modelUUID } = useParams(); - const [triggerImportFeedback, { isLoading, isError }] = useImportCurrentDataMutation({ fixedCacheKey: `imports-reference-data-${modelUUID}` }); - const isSubmitDisabled = isLoading || isError; + const [triggerImportFeedback, { isLoading }] = useImportCurrentDataMutation({ fixedCacheKey: `imports-reference-data-${modelUUID}` }); + const isSubmitDisabled = isLoading; const disableUploadAction = () => false; diff --git a/ui/src/container/models/Details/current-dashboard/imports/current-import-detail-modal/current-dashboard-modal.jsx b/ui/src/components/modals/current-import-detail-modal/body.jsx similarity index 63% rename from ui/src/container/models/Details/current-dashboard/imports/current-import-detail-modal/current-dashboard-modal.jsx rename to ui/src/components/modals/current-import-detail-modal/body.jsx index c96be0be..edd97e83 100644 --- a/ui/src/container/models/Details/current-dashboard/imports/current-import-detail-modal/current-dashboard-modal.jsx +++ b/ui/src/components/modals/current-import-detail-modal/body.jsx @@ -1,9 +1,9 @@ import { Tabs } from '@radicalbit/radicalbit-design-system'; import { useSearchParams } from 'react-router-dom'; import { METRICS_TABS } from '@Container/models/Details/constants'; -import DataDriftMetrics from '../../data-drift-metrics'; -import DataQualityMetrics from '../../data-quality-metrics'; -import ModelQualityMetrics from '../../model-quality-metrics'; +import DataQualityMetrics from '@Container/models/Details/reference/data-quality'; +import ModelQualityMetrics from '@Container/models/Details/reference/model-quality'; +import DataDriftMetrics from '@Container/models/Details/current/data-drift'; const tabs = [ { @@ -23,7 +23,7 @@ const tabs = [ }, ]; -export default function CurrentDashboardModal() { +function Body() { const [searchParams, setSearchParams] = useSearchParams(); const activeTab = searchParams.get('modal-tab-metrics') || METRICS_TABS.METRICS; @@ -38,14 +38,17 @@ export default function CurrentDashboardModal() { }; return ( - -
- +
+
+ +
); } + +export default Body; diff --git a/ui/src/container/models/Details/current-dashboard/imports/current-import-detail-modal/index.jsx b/ui/src/components/modals/current-import-detail-modal/index.jsx similarity index 95% rename from ui/src/container/models/Details/current-dashboard/imports/current-import-detail-modal/index.jsx rename to ui/src/components/modals/current-import-detail-modal/index.jsx index 1eb1e5f8..5b5542b7 100644 --- a/ui/src/container/models/Details/current-dashboard/imports/current-import-detail-modal/index.jsx +++ b/ui/src/components/modals/current-import-detail-modal/index.jsx @@ -16,7 +16,7 @@ import { import { memo } from 'react'; import { useParams } from 'react-router'; import { useSearchParams } from 'react-router-dom'; -import CurrentDashboardModal from './current-dashboard-modal'; +import Body from './body'; const { useGetModelByUUIDQuery } = modelsApiSlice; @@ -38,9 +38,7 @@ function CurrentImportDetailModal() { onCancel={handleOnCancel} open > -
- -
+ ); } diff --git a/ui/src/components/modals/modals-provider.jsx b/ui/src/components/modals/modals-provider.jsx index 1342ee90..4e23c92d 100644 --- a/ui/src/components/modals/modals-provider.jsx +++ b/ui/src/components/modals/modals-provider.jsx @@ -1,7 +1,7 @@ import { ModalsEnum } from '@Src/constants'; import useModals from '@Src/hooks/use-modals'; import AddNewModel from './add-new-model'; -import CurrentImportsDetailModal from '../../container/models/Details/current-dashboard/imports/current-import-detail-modal'; +import CurrentImportsDetailModal from './current-import-detail-modal'; export default function ModalsProvider() { const { modalPayload: { modalName } } = useModals(); diff --git a/ui/src/container/models/Details/charts/line-chart/options.js b/ui/src/container/models/Details/charts/line-chart/options.js index 8e5ea881..5b7aea71 100644 --- a/ui/src/container/models/Details/charts/line-chart/options.js +++ b/ui/src/container/models/Details/charts/line-chart/options.js @@ -1,6 +1,6 @@ import { numberFormatter } from '@Src/constants'; import moment from 'moment'; -import { CHART_COLOR } from '../../constants'; +import { CHART_COLOR } from '@Container/models/Details/constants'; export default function lineChartOptions(title, color, currentDataset, referenceDataset) { const series = [ diff --git a/ui/src/container/models/Details/current-dashboard/data-drift-metrics/binary-classification-metrics/header/index.jsx b/ui/src/container/models/Details/current/data-drift/binary-classification/header/index.jsx similarity index 100% rename from ui/src/container/models/Details/current-dashboard/data-drift-metrics/binary-classification-metrics/header/index.jsx rename to ui/src/container/models/Details/current/data-drift/binary-classification/header/index.jsx diff --git a/ui/src/container/models/Details/current-dashboard/data-drift-metrics/binary-classification-metrics/index.jsx b/ui/src/container/models/Details/current/data-drift/binary-classification/index.jsx similarity index 100% rename from ui/src/container/models/Details/current-dashboard/data-drift-metrics/binary-classification-metrics/index.jsx rename to ui/src/container/models/Details/current/data-drift/binary-classification/index.jsx diff --git a/ui/src/container/models/Details/current-dashboard/data-drift-metrics/binary-classification-metrics/list/index.jsx b/ui/src/container/models/Details/current/data-drift/binary-classification/list/index.jsx similarity index 100% rename from ui/src/container/models/Details/current-dashboard/data-drift-metrics/binary-classification-metrics/list/index.jsx rename to ui/src/container/models/Details/current/data-drift/binary-classification/list/index.jsx diff --git a/ui/src/container/models/Details/current-dashboard/data-drift-metrics/binary-classification-metrics/search-filter/index.jsx b/ui/src/container/models/Details/current/data-drift/binary-classification/search-filter/index.jsx similarity index 100% rename from ui/src/container/models/Details/current-dashboard/data-drift-metrics/binary-classification-metrics/search-filter/index.jsx rename to ui/src/container/models/Details/current/data-drift/binary-classification/search-filter/index.jsx diff --git a/ui/src/container/models/Details/current-dashboard/data-drift-metrics/binary-classification-metrics/use-get-filtered-features.js b/ui/src/container/models/Details/current/data-drift/binary-classification/use-get-filtered-features.js similarity index 100% rename from ui/src/container/models/Details/current-dashboard/data-drift-metrics/binary-classification-metrics/use-get-filtered-features.js rename to ui/src/container/models/Details/current/data-drift/binary-classification/use-get-filtered-features.js diff --git a/ui/src/container/models/Details/current-dashboard/data-drift-metrics/index.jsx b/ui/src/container/models/Details/current/data-drift/index.jsx similarity index 98% rename from ui/src/container/models/Details/current-dashboard/data-drift-metrics/index.jsx rename to ui/src/container/models/Details/current/data-drift/index.jsx index b894dc3b..ce97591e 100644 --- a/ui/src/container/models/Details/current-dashboard/data-drift-metrics/index.jsx +++ b/ui/src/container/models/Details/current/data-drift/index.jsx @@ -2,7 +2,7 @@ import { modelsApiSlice } from '@Src/store/state/models/api'; import { ModelTypeEnum } from '@State/models/constants'; import { memo } from 'react'; import { useParams } from 'react-router'; -import BinaryClassificationMetrics from './binary-classification-metrics'; +import BinaryClassificationMetrics from './binary-classification'; const { useGetModelByUUIDQuery } = modelsApiSlice; diff --git a/ui/src/container/models/Details/current-dashboard/data-quality-metrics/binary-classification-metrics/data-point-distribution/index.jsx b/ui/src/container/models/Details/current/data-quality/binary-classification/data-point-distribution/index.jsx similarity index 100% rename from ui/src/container/models/Details/current-dashboard/data-quality-metrics/binary-classification-metrics/data-point-distribution/index.jsx rename to ui/src/container/models/Details/current/data-quality/binary-classification/data-point-distribution/index.jsx diff --git a/ui/src/container/models/Details/current-dashboard/data-quality-metrics/binary-classification-metrics/data-point-distribution/options.jsx b/ui/src/container/models/Details/current/data-quality/binary-classification/data-point-distribution/options.jsx similarity index 100% rename from ui/src/container/models/Details/current-dashboard/data-quality-metrics/binary-classification-metrics/data-point-distribution/options.jsx rename to ui/src/container/models/Details/current/data-quality/binary-classification/data-point-distribution/options.jsx diff --git a/ui/src/container/models/Details/current-dashboard/data-quality-metrics/binary-classification-metrics/data-quality-list/categorical/left-table/columns.jsx b/ui/src/container/models/Details/current/data-quality/binary-classification/data-quality-list/categorical/left-table/columns.jsx similarity index 100% rename from ui/src/container/models/Details/current-dashboard/data-quality-metrics/binary-classification-metrics/data-quality-list/categorical/left-table/columns.jsx rename to ui/src/container/models/Details/current/data-quality/binary-classification/data-quality-list/categorical/left-table/columns.jsx diff --git a/ui/src/container/models/Details/current-dashboard/data-quality-metrics/binary-classification-metrics/data-quality-list/categorical/left-table/index.jsx b/ui/src/container/models/Details/current/data-quality/binary-classification/data-quality-list/categorical/left-table/index.jsx similarity index 100% rename from ui/src/container/models/Details/current-dashboard/data-quality-metrics/binary-classification-metrics/data-quality-list/categorical/left-table/index.jsx rename to ui/src/container/models/Details/current/data-quality/binary-classification/data-quality-list/categorical/left-table/index.jsx diff --git a/ui/src/container/models/Details/current-dashboard/data-quality-metrics/binary-classification-metrics/data-quality-list/categorical/right-table/columns.jsx b/ui/src/container/models/Details/current/data-quality/binary-classification/data-quality-list/categorical/right-table/columns.jsx similarity index 100% rename from ui/src/container/models/Details/current-dashboard/data-quality-metrics/binary-classification-metrics/data-quality-list/categorical/right-table/columns.jsx rename to ui/src/container/models/Details/current/data-quality/binary-classification/data-quality-list/categorical/right-table/columns.jsx diff --git a/ui/src/container/models/Details/current-dashboard/data-quality-metrics/binary-classification-metrics/data-quality-list/categorical/right-table/index.jsx b/ui/src/container/models/Details/current/data-quality/binary-classification/data-quality-list/categorical/right-table/index.jsx similarity index 100% rename from ui/src/container/models/Details/current-dashboard/data-quality-metrics/binary-classification-metrics/data-quality-list/categorical/right-table/index.jsx rename to ui/src/container/models/Details/current/data-quality/binary-classification/data-quality-list/categorical/right-table/index.jsx diff --git a/ui/src/container/models/Details/current-dashboard/data-quality-metrics/binary-classification-metrics/data-quality-list/index.jsx b/ui/src/container/models/Details/current/data-quality/binary-classification/data-quality-list/index.jsx similarity index 100% rename from ui/src/container/models/Details/current-dashboard/data-quality-metrics/binary-classification-metrics/data-quality-list/index.jsx rename to ui/src/container/models/Details/current/data-quality/binary-classification/data-quality-list/index.jsx diff --git a/ui/src/container/models/Details/current-dashboard/data-quality-metrics/binary-classification-metrics/data-quality-list/numerical/chart/index.jsx b/ui/src/container/models/Details/current/data-quality/binary-classification/data-quality-list/numerical/chart/index.jsx similarity index 100% rename from ui/src/container/models/Details/current-dashboard/data-quality-metrics/binary-classification-metrics/data-quality-list/numerical/chart/index.jsx rename to ui/src/container/models/Details/current/data-quality/binary-classification/data-quality-list/numerical/chart/index.jsx diff --git a/ui/src/container/models/Details/current-dashboard/data-quality-metrics/binary-classification-metrics/data-quality-list/numerical/chart/options.js b/ui/src/container/models/Details/current/data-quality/binary-classification/data-quality-list/numerical/chart/options.js similarity index 100% rename from ui/src/container/models/Details/current-dashboard/data-quality-metrics/binary-classification-metrics/data-quality-list/numerical/chart/options.js rename to ui/src/container/models/Details/current/data-quality/binary-classification/data-quality-list/numerical/chart/options.js diff --git a/ui/src/container/models/Details/current-dashboard/data-quality-metrics/binary-classification-metrics/data-quality-list/numerical/table/columns.jsx b/ui/src/container/models/Details/current/data-quality/binary-classification/data-quality-list/numerical/table/columns.jsx similarity index 100% rename from ui/src/container/models/Details/current-dashboard/data-quality-metrics/binary-classification-metrics/data-quality-list/numerical/table/columns.jsx rename to ui/src/container/models/Details/current/data-quality/binary-classification/data-quality-list/numerical/table/columns.jsx diff --git a/ui/src/container/models/Details/current-dashboard/data-quality-metrics/binary-classification-metrics/data-quality-list/numerical/table/index.jsx b/ui/src/container/models/Details/current/data-quality/binary-classification/data-quality-list/numerical/table/index.jsx similarity index 100% rename from ui/src/container/models/Details/current-dashboard/data-quality-metrics/binary-classification-metrics/data-quality-list/numerical/table/index.jsx rename to ui/src/container/models/Details/current/data-quality/binary-classification/data-quality-list/numerical/table/index.jsx diff --git a/ui/src/container/models/Details/current-dashboard/data-quality-metrics/binary-classification-metrics/index.jsx b/ui/src/container/models/Details/current/data-quality/binary-classification/index.jsx similarity index 100% rename from ui/src/container/models/Details/current-dashboard/data-quality-metrics/binary-classification-metrics/index.jsx rename to ui/src/container/models/Details/current/data-quality/binary-classification/index.jsx diff --git a/ui/src/container/models/Details/current-dashboard/data-quality-metrics/binary-classification-metrics/search-filter/index.jsx b/ui/src/container/models/Details/current/data-quality/binary-classification/search-filter/index.jsx similarity index 100% rename from ui/src/container/models/Details/current-dashboard/data-quality-metrics/binary-classification-metrics/search-filter/index.jsx rename to ui/src/container/models/Details/current/data-quality/binary-classification/search-filter/index.jsx diff --git a/ui/src/container/models/Details/current-dashboard/data-quality-metrics/binary-classification-metrics/use-get-filtered-features.js b/ui/src/container/models/Details/current/data-quality/binary-classification/use-get-filtered-features.js similarity index 100% rename from ui/src/container/models/Details/current-dashboard/data-quality-metrics/binary-classification-metrics/use-get-filtered-features.js rename to ui/src/container/models/Details/current/data-quality/binary-classification/use-get-filtered-features.js diff --git a/ui/src/container/models/Details/current-dashboard/data-quality-metrics/index.jsx b/ui/src/container/models/Details/current/data-quality/index.jsx similarity index 98% rename from ui/src/container/models/Details/current-dashboard/data-quality-metrics/index.jsx rename to ui/src/container/models/Details/current/data-quality/index.jsx index 75cfea50..f5a7b539 100644 --- a/ui/src/container/models/Details/current-dashboard/data-quality-metrics/index.jsx +++ b/ui/src/container/models/Details/current/data-quality/index.jsx @@ -2,7 +2,7 @@ import { modelsApiSlice } from '@Src/store/state/models/api'; import { ModelTypeEnum } from '@State/models/constants'; import { memo } from 'react'; import { useParams } from 'react-router'; -import BinaryClassificationMetrics from './binary-classification-metrics'; +import BinaryClassificationMetrics from './binary-classification'; const { useGetModelByUUIDQuery } = modelsApiSlice; diff --git a/ui/src/container/models/Details/current-dashboard/imports/columns.jsx b/ui/src/container/models/Details/current/imports/columns.jsx similarity index 92% rename from ui/src/container/models/Details/current-dashboard/imports/columns.jsx rename to ui/src/container/models/Details/current/imports/columns.jsx index 48a5b05f..deb5f7a6 100644 --- a/ui/src/container/models/Details/current-dashboard/imports/columns.jsx +++ b/ui/src/container/models/Details/current/imports/columns.jsx @@ -6,13 +6,6 @@ import moment from 'moment'; import { DataTableAction, FontAwesomeIcon, Spinner } from '@radicalbit/radicalbit-design-system'; export const getColumns = (activeFilters, activeSorter) => [ - columnFactory({ - title: 'File name', - dataIndex: 'fileName', - key: 'fileName', - activeFilters, - activeSorter, - }), columnFactory({ title: 'File path', dataIndex: 'path', diff --git a/ui/src/container/models/Details/current-dashboard/imports/index.jsx b/ui/src/container/models/Details/current/imports/index.jsx similarity index 91% rename from ui/src/container/models/Details/current-dashboard/imports/index.jsx rename to ui/src/container/models/Details/current/imports/index.jsx index f4aa4e5a..9af58b43 100644 --- a/ui/src/container/models/Details/current-dashboard/imports/index.jsx +++ b/ui/src/container/models/Details/current/imports/index.jsx @@ -59,19 +59,13 @@ function FeedbackTable() { const queryParams = useSelector((state) => contextConfigurationSelectors.selectQueryParamsSelector(state, NamespaceEnum.CURRENT_IMPORT)); const { data } = useGetCurrentImportsQuery({ uuid: modelUUID, queryParams }); - const importList = data?.items.map((item) => ({ - ...item, - fileName: item.path.split('current/')[1], - path: `${item.path.split('current/')[0]}current/`, - errorEntries: 0, - entries: 100, - })) ?? []; + const items = data?.items || []; const recordCount = data?.total; return ( ); + return (); } } diff --git a/ui/src/container/models/Details/overview/index.jsx b/ui/src/container/models/Details/overview/index.jsx index 832898e1..b5b050c2 100644 --- a/ui/src/container/models/Details/overview/index.jsx +++ b/ui/src/container/models/Details/overview/index.jsx @@ -2,7 +2,7 @@ import { Tabs, } from '@radicalbit/radicalbit-design-system'; import { useSearchParams } from 'react-router-dom'; -import { MODEL_TABS_ENUM, OVERVIEW_TABS_ENUM } from '../constants'; +import { MODEL_TABS_ENUM, OVERVIEW_TABS_ENUM } from '@Container/models/Details/constants'; import OutputsTab from './outputs-tab'; import SummaryTab from './summary-tab'; import VariablesTab from './variables-tab'; @@ -18,9 +18,21 @@ function Overview() { }; const tabs = [ - { label: 'Summary', key: OVERVIEW_TABS_ENUM.SUMMARY, children: }, - { label: 'Variables', key: OVERVIEW_TABS_ENUM.VARIABLES, children: }, - { label: 'Outputs', key: OVERVIEW_TABS_ENUM.OUTPUTS, children: }, + { + label: 'Summary', + key: OVERVIEW_TABS_ENUM.SUMMARY, + children: , + }, + { + label: 'Variables', + key: OVERVIEW_TABS_ENUM.VARIABLES, + children: , + }, + { + label: 'Outputs', + key: OVERVIEW_TABS_ENUM.OUTPUTS, + children: , + }, ]; return ( diff --git a/ui/src/container/models/Details/overview/outputs-tab/columns.jsx b/ui/src/container/models/Details/overview/outputs-tab/columns.jsx index b5b21909..e72c5fac 100644 --- a/ui/src/container/models/Details/overview/outputs-tab/columns.jsx +++ b/ui/src/container/models/Details/overview/outputs-tab/columns.jsx @@ -1,5 +1,5 @@ import { Tag } from '@radicalbit/radicalbit-design-system'; -import { OVERVIEW_ROW_TYPE } from '../../constants'; +import { OVERVIEW_ROW_TYPE } from '@Container/models/Details/constants'; const outputsColumns = (dataSource) => [ { diff --git a/ui/src/container/models/Details/overview/outputs-tab/index.jsx b/ui/src/container/models/Details/overview/outputs-tab/index.jsx index dadfdc5f..d2a33ee7 100644 --- a/ui/src/container/models/Details/overview/outputs-tab/index.jsx +++ b/ui/src/container/models/Details/overview/outputs-tab/index.jsx @@ -2,7 +2,7 @@ import { DataTable } from '@radicalbit/radicalbit-design-system'; import { memo } from 'react'; import { useParams } from 'react-router'; import { modelsApiSlice } from '@Store/state/models/api'; -import { OVERVIEW_ROW_TYPE } from '../../constants'; +import { OVERVIEW_ROW_TYPE } from '@Container/models/Details/constants'; import outputsColumns from './columns'; const { useGetModelByUUIDQuery } = modelsApiSlice; diff --git a/ui/src/container/models/Details/overview/variables-tab/index.jsx b/ui/src/container/models/Details/overview/variables-tab/index.jsx index 46800cb4..01ac6efb 100644 --- a/ui/src/container/models/Details/overview/variables-tab/index.jsx +++ b/ui/src/container/models/Details/overview/variables-tab/index.jsx @@ -2,8 +2,8 @@ import { DataTable } from '@radicalbit/radicalbit-design-system'; import { useParams } from 'react-router'; import { memo } from 'react'; import { modelsApiSlice } from '@Store/state/models/api'; +import { OVERVIEW_ROW_TYPE } from '@Container/models/Details/constants'; import featuresColumns from './columns'; -import { OVERVIEW_ROW_TYPE } from '../../constants'; const { useGetModelByUUIDQuery } = modelsApiSlice; diff --git a/ui/src/container/models/Details/reference-dashboard/data-quality-metrics/binary-classification-metrics/data-point-distribution/index.jsx b/ui/src/container/models/Details/reference/data-quality/binary-classification/data-point-distribution/index.jsx similarity index 100% rename from ui/src/container/models/Details/reference-dashboard/data-quality-metrics/binary-classification-metrics/data-point-distribution/index.jsx rename to ui/src/container/models/Details/reference/data-quality/binary-classification/data-point-distribution/index.jsx diff --git a/ui/src/container/models/Details/reference-dashboard/data-quality-metrics/binary-classification-metrics/data-point-distribution/options.jsx b/ui/src/container/models/Details/reference/data-quality/binary-classification/data-point-distribution/options.jsx similarity index 100% rename from ui/src/container/models/Details/reference-dashboard/data-quality-metrics/binary-classification-metrics/data-point-distribution/options.jsx rename to ui/src/container/models/Details/reference/data-quality/binary-classification/data-point-distribution/options.jsx diff --git a/ui/src/container/models/Details/reference-dashboard/data-quality-metrics/binary-classification-metrics/data-quality-list/categorical/left-table/columns.jsx b/ui/src/container/models/Details/reference/data-quality/binary-classification/data-quality-list/categorical/left-table/columns.jsx similarity index 100% rename from ui/src/container/models/Details/reference-dashboard/data-quality-metrics/binary-classification-metrics/data-quality-list/categorical/left-table/columns.jsx rename to ui/src/container/models/Details/reference/data-quality/binary-classification/data-quality-list/categorical/left-table/columns.jsx diff --git a/ui/src/container/models/Details/reference-dashboard/data-quality-metrics/binary-classification-metrics/data-quality-list/categorical/left-table/index.jsx b/ui/src/container/models/Details/reference/data-quality/binary-classification/data-quality-list/categorical/left-table/index.jsx similarity index 100% rename from ui/src/container/models/Details/reference-dashboard/data-quality-metrics/binary-classification-metrics/data-quality-list/categorical/left-table/index.jsx rename to ui/src/container/models/Details/reference/data-quality/binary-classification/data-quality-list/categorical/left-table/index.jsx diff --git a/ui/src/container/models/Details/reference-dashboard/data-quality-metrics/binary-classification-metrics/data-quality-list/categorical/right-table/columns.jsx b/ui/src/container/models/Details/reference/data-quality/binary-classification/data-quality-list/categorical/right-table/columns.jsx similarity index 100% rename from ui/src/container/models/Details/reference-dashboard/data-quality-metrics/binary-classification-metrics/data-quality-list/categorical/right-table/columns.jsx rename to ui/src/container/models/Details/reference/data-quality/binary-classification/data-quality-list/categorical/right-table/columns.jsx diff --git a/ui/src/container/models/Details/reference-dashboard/data-quality-metrics/binary-classification-metrics/data-quality-list/categorical/right-table/index.jsx b/ui/src/container/models/Details/reference/data-quality/binary-classification/data-quality-list/categorical/right-table/index.jsx similarity index 100% rename from ui/src/container/models/Details/reference-dashboard/data-quality-metrics/binary-classification-metrics/data-quality-list/categorical/right-table/index.jsx rename to ui/src/container/models/Details/reference/data-quality/binary-classification/data-quality-list/categorical/right-table/index.jsx diff --git a/ui/src/container/models/Details/reference-dashboard/data-quality-metrics/binary-classification-metrics/data-quality-list/index.jsx b/ui/src/container/models/Details/reference/data-quality/binary-classification/data-quality-list/index.jsx similarity index 100% rename from ui/src/container/models/Details/reference-dashboard/data-quality-metrics/binary-classification-metrics/data-quality-list/index.jsx rename to ui/src/container/models/Details/reference/data-quality/binary-classification/data-quality-list/index.jsx diff --git a/ui/src/container/models/Details/reference-dashboard/data-quality-metrics/binary-classification-metrics/data-quality-list/numerical/chart/index.jsx b/ui/src/container/models/Details/reference/data-quality/binary-classification/data-quality-list/numerical/chart/index.jsx similarity index 100% rename from ui/src/container/models/Details/reference-dashboard/data-quality-metrics/binary-classification-metrics/data-quality-list/numerical/chart/index.jsx rename to ui/src/container/models/Details/reference/data-quality/binary-classification/data-quality-list/numerical/chart/index.jsx diff --git a/ui/src/container/models/Details/reference-dashboard/data-quality-metrics/binary-classification-metrics/data-quality-list/numerical/chart/options.js b/ui/src/container/models/Details/reference/data-quality/binary-classification/data-quality-list/numerical/chart/options.js similarity index 100% rename from ui/src/container/models/Details/reference-dashboard/data-quality-metrics/binary-classification-metrics/data-quality-list/numerical/chart/options.js rename to ui/src/container/models/Details/reference/data-quality/binary-classification/data-quality-list/numerical/chart/options.js diff --git a/ui/src/container/models/Details/reference-dashboard/data-quality-metrics/binary-classification-metrics/data-quality-list/numerical/table/columns.jsx b/ui/src/container/models/Details/reference/data-quality/binary-classification/data-quality-list/numerical/table/columns.jsx similarity index 100% rename from ui/src/container/models/Details/reference-dashboard/data-quality-metrics/binary-classification-metrics/data-quality-list/numerical/table/columns.jsx rename to ui/src/container/models/Details/reference/data-quality/binary-classification/data-quality-list/numerical/table/columns.jsx diff --git a/ui/src/container/models/Details/reference-dashboard/data-quality-metrics/binary-classification-metrics/data-quality-list/numerical/table/index.jsx b/ui/src/container/models/Details/reference/data-quality/binary-classification/data-quality-list/numerical/table/index.jsx similarity index 100% rename from ui/src/container/models/Details/reference-dashboard/data-quality-metrics/binary-classification-metrics/data-quality-list/numerical/table/index.jsx rename to ui/src/container/models/Details/reference/data-quality/binary-classification/data-quality-list/numerical/table/index.jsx diff --git a/ui/src/container/models/Details/reference-dashboard/data-quality-metrics/binary-classification-metrics/index.jsx b/ui/src/container/models/Details/reference/data-quality/binary-classification/index.jsx similarity index 100% rename from ui/src/container/models/Details/reference-dashboard/data-quality-metrics/binary-classification-metrics/index.jsx rename to ui/src/container/models/Details/reference/data-quality/binary-classification/index.jsx diff --git a/ui/src/container/models/Details/reference-dashboard/data-quality-metrics/binary-classification-metrics/search-filter/index.jsx b/ui/src/container/models/Details/reference/data-quality/binary-classification/search-filter/index.jsx similarity index 100% rename from ui/src/container/models/Details/reference-dashboard/data-quality-metrics/binary-classification-metrics/search-filter/index.jsx rename to ui/src/container/models/Details/reference/data-quality/binary-classification/search-filter/index.jsx diff --git a/ui/src/container/models/Details/reference-dashboard/data-quality-metrics/binary-classification-metrics/use-get-filtered-features.js b/ui/src/container/models/Details/reference/data-quality/binary-classification/use-get-filtered-features.js similarity index 100% rename from ui/src/container/models/Details/reference-dashboard/data-quality-metrics/binary-classification-metrics/use-get-filtered-features.js rename to ui/src/container/models/Details/reference/data-quality/binary-classification/use-get-filtered-features.js diff --git a/ui/src/container/models/Details/reference-dashboard/data-quality-metrics/index.jsx b/ui/src/container/models/Details/reference/data-quality/index.jsx similarity index 98% rename from ui/src/container/models/Details/reference-dashboard/data-quality-metrics/index.jsx rename to ui/src/container/models/Details/reference/data-quality/index.jsx index 75cfea50..f5a7b539 100644 --- a/ui/src/container/models/Details/reference-dashboard/data-quality-metrics/index.jsx +++ b/ui/src/container/models/Details/reference/data-quality/index.jsx @@ -2,7 +2,7 @@ import { modelsApiSlice } from '@Src/store/state/models/api'; import { ModelTypeEnum } from '@State/models/constants'; import { memo } from 'react'; import { useParams } from 'react-router'; -import BinaryClassificationMetrics from './binary-classification-metrics'; +import BinaryClassificationMetrics from './binary-classification'; const { useGetModelByUUIDQuery } = modelsApiSlice; diff --git a/ui/src/container/models/Details/reference-dashboard/imports/columns.jsx b/ui/src/container/models/Details/reference/imports/columns.jsx similarity index 89% rename from ui/src/container/models/Details/reference-dashboard/imports/columns.jsx rename to ui/src/container/models/Details/reference/imports/columns.jsx index 237feefe..10441545 100644 --- a/ui/src/container/models/Details/reference-dashboard/imports/columns.jsx +++ b/ui/src/container/models/Details/reference/imports/columns.jsx @@ -5,13 +5,6 @@ import moment from 'moment'; import { FontAwesomeIcon, Spinner } from '@radicalbit/radicalbit-design-system'; export const getColumns = (activeFilters, activeSorter) => [ - columnFactory({ - title: 'File name', - dataIndex: 'fileName', - key: 'fileName', - activeFilters, - activeSorter, - }), columnFactory({ title: 'File path', dataIndex: 'path', diff --git a/ui/src/container/models/Details/reference-dashboard/imports/index.jsx b/ui/src/container/models/Details/reference/imports/index.jsx similarity index 86% rename from ui/src/container/models/Details/reference-dashboard/imports/index.jsx rename to ui/src/container/models/Details/reference/imports/index.jsx index dbe91663..362d98f5 100644 --- a/ui/src/container/models/Details/reference-dashboard/imports/index.jsx +++ b/ui/src/container/models/Details/reference/imports/index.jsx @@ -43,19 +43,13 @@ function FeedbackTable() { const { uuid: modelUUID } = useParams(); const { data } = useGetReferenceImportsQuery({ uuid: modelUUID }); - const importList = data?.items.map((item) => ({ - ...item, - fileName: item.path.split('reference/')[1], - path: `${item.path.split('reference/')[0]}reference/`, - errorEntries: 0, - entries: 100, - })) ?? []; + const items = data?.items || []; const recordCount = data?.total; return ( (next) => (action) => { const error2 = action.payload?.data?.error?.message; // likes models-repo errors const error3 = action.payload?.data; const message = error1 || error2 || error3 || 'generic error'; - const notificationMessage = notificationErrorJson({ status, statusText: message }); + const notificationMessage = notificationErrorJson({ status, message }); dispatch(setNotificationMessage(notificationMessage)); } diff --git a/ui/src/store/state/notification/hooks.js b/ui/src/store/state/notification/hooks.js index 2e28a4d9..fb03984e 100644 --- a/ui/src/store/state/notification/hooks.js +++ b/ui/src/store/state/notification/hooks.js @@ -13,8 +13,8 @@ const useNotification = () => { useEffect(() => { if (notificationShowMessage) { - const { type, title } = notificationMessage; - Message[type](title); + const { type, title, content } = notificationMessage; + Message[type]({ title, content }); dispatch(resetNotificationMessage()); } diff --git a/ui/src/store/state/notification/slice.js b/ui/src/store/state/notification/slice.js index c7c620f2..e0a075f1 100644 --- a/ui/src/store/state/notification/slice.js +++ b/ui/src/store/state/notification/slice.js @@ -1,5 +1,5 @@ import { createSlice } from '@reduxjs/toolkit'; -import { NotificationEnum } from './constants'; +import { NotificationEnum } from '@State/notification/constants'; const initialState = { showMessage: false,