mchades commented on code in PR #12900:
URL: https://github.com/apache/gravitino/pull/12900#discussion_r4279625227
##########
web-v2/web/src/lib/store/metalakes/index.js:
##########
@@ -3086,6 +3298,40 @@ export const appMetalakesSlice = createSlice({
toast.error(action.error.message)
}
})
+ builder.addCase(fetchSemanticModels.pending, (state, action) => {
+ const key = semanticModelSchemaKey(action.meta.arg)
+ state.semanticModelRequests[key] = { requestId: action.meta.requestId }
+ state.semanticModelListRequestId = action.meta.requestId
+ })
+ builder.addCase(fetchSemanticModels.fulfilled, (state, action) => {
+ if (action.payload.stale) return
+ const request = state.semanticModelRequests[action.payload.schemaKey]
+ if (request && request.requestId !== action.meta.requestId) return
+ if (request) request.semanticModels = action.payload.semanticModels
+ if (!state.semanticModelListRequestId ||
state.semanticModelListRequestId === action.meta.requestId) {
+ state.semanticModels = action.payload.semanticModels
+ }
+ })
+ builder.addCase(fetchSemanticModels.rejected, (state, action) => {
+ if (action.error.name !== 'CanceledError' &&
!action.error.message.includes('CanceledError')) {
+ toast.error(action.error.message)
+ }
+ })
+ builder.addCase(getSemanticModelDetails.fulfilled, (state, action) => {
+ if (action.payload.init) {
+ state.activatedDetails = action.payload.semanticModel
+ }
Review Comment:
[P2] The reverse navigation path still reproduces this on `6a368938a`: hold
a table GET, open `sales_model` and wait for it to load, then release the table
response. The URL/title still identify the model, but its datasets become "No
data" and Edit/Export are disabled. I reproduced this in Chrome;
controlled-order tests also fail for both table → model and schema → model.
Only the semantic-model branch assigns the abortable requests/checks
`canceled`; the older table/schema reducers and their loading/tag follow-ups
still write shared state. Please guard every writer against the active
entity/request and cover both navigation directions.
##########
web-v2/web/src/app/catalogs/rightContent/entitiesContent/SemanticModelDetailsPage.js:
##########
@@ -0,0 +1,576 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+'use client'
+
+import { useMemo, useState } from 'react'
+import { Button, Divider, Flex, Popover, Space, Spin, Table, Tabs, Tag,
Tooltip, Typography, message } from 'antd'
+import { useAntdColumnResize } from 'react-antd-column-resize'
+import useResizeObserver from 'use-resize-observer'
+import { useRouter, useSearchParams } from 'next/navigation'
+import Tags from '@/components/CustomTags'
+import GetOwner from '@/components/GetOwner'
+import Icons from '@/components/Icons'
+import PropertiesContent from '@/components/PropertiesContent'
+import { useAppDispatch, useAppSelector } from '@/lib/hooks/useStore'
+import { getSemanticModelDetails } from '@/lib/store/metalakes'
+import { copyToClipboard } from '@/lib/utils'
+import { formatToDateTime, isValidDate } from '@/lib/utils/date'
+import { formatSemanticModelDefinition } from '@/lib/utils/semanticModel'
+import SemanticModelAIContext from './SemanticModelAIContext'
+import SemanticModelExport from './SemanticModelExport'
+import SemanticModelExtensions from './SemanticModelExtensions'
+import CreateSemanticModelDialog from '../CreateSemanticModelDialog'
+
+const { Title, Paragraph } = Typography
+
+const sourceFullName = source => {
+ if (!source) {
+ return '-'
+ }
+
+ return [...(source.namespace || []), source.name].filter(Boolean).join('.')
+}
+
+const renderExpression = expression => {
+ const dialects = expression?.dialects || []
+
+ if (!dialects.length) {
+ return <span>-</span>
+ }
+
+ return (
+ <Space direction='vertical' size={2}>
+ {dialects.map((dialect, index) => (
+ <span key={`${dialect?.dialect}-${index}`}>
+ <Tag>{dialect?.dialect}</Tag>
+ <span className='font-mono text-xs'>{dialect?.expression}</span>
+ </span>
+ ))}
+ </Space>
+ )
+}
+
+const renderColumns = columns => <span className='font-mono text-xs'>{(columns
|| []).join(', ') || '-'}</span>
+
+const hasMetadata = entity => !!entity.aiContext ||
entity.customExtensions?.length > 0
+
+const renderMetadata = (entity, label) => (
+ <>
+ <SemanticModelAIContext context={entity?.aiContext} label={`${label} AI
Context`} />
+ <SemanticModelExtensions extensions={entity?.customExtensions}
label={`${label} Vendor Extensions`} />
+ </>
+)
+
+export default function SemanticModelDetailsPage() {
+ const searchParams = useSearchParams()
+ const router = useRouter()
+ const dispatch = useAppDispatch()
+ const metalake = searchParams.get('metalake')
+ const catalog = searchParams.get('catalog')
+ const schema = searchParams.get('schema')
+ const semanticModelName = searchParams.get('semanticModel')
+ const auth = useAppSelector(state => state.auth)
+ const { anthEnable } = auth
+ const store = useAppSelector(state => state.metalakes)
+ const semanticModel = store.activatedDetails
+ const [tabKey, setTabKey] = useState('Datasets')
+ const [openEdit, setOpenEdit] = useState(false)
+ const { ref, width } = useResizeObserver()
+
+ const definition = semanticModel?.definition
+ const properties = semanticModel?.properties
+ const createdAt = semanticModel?.audit?.createTime
+ const createdAtText = !createdAt || !isValidDate(createdAt) ? '-' :
formatToDateTime(createdAt)
+ const lastModifiedAt = semanticModel?.audit?.lastModifiedTime
+ const lastModifiedText = !lastModifiedAt || !isValidDate(lastModifiedAt) ?
'-' : formatToDateTime(lastModifiedAt)
+ const metadataObjectFullName = `${catalog}.${schema}.${semanticModelName}`
+
+ const datasets = useMemo(
+ () => (definition?.datasets || []).map(dataset => ({ ...dataset, key:
dataset.name })),
+ [definition]
+ )
+
+ const relationships = useMemo(
+ () => (definition?.relationships || []).map(relationship => ({
...relationship, key: relationship.name })),
+ [definition]
+ )
+
+ const metrics = useMemo(
+ () => (definition?.metrics || []).map(metric => ({ ...metric, key:
metric.name })),
+ [definition]
+ )
+
+ const definitionText = useMemo(() =>
formatSemanticModelDefinition(definition), [definition])
+
+ const tagContent = (
+ <div>
+ <Tags readOnly={true} metadataObjectType={'semantic_model'}
metadataObjectFullName={metadataObjectFullName} />
+ </div>
+ )
+
+ const propertyContent = <PropertiesContent properties={properties} />
+
+ const onSaved = async updated => {
+ if (updated.name !== semanticModelName) {
+ const params = new URLSearchParams(searchParams.toString())
+ params.set('semanticModel', updated.name)
+ router.replace(`/catalogs?${params.toString()}`)
+ } else {
+ await dispatch(getSemanticModelDetails({ metalake, catalog, schema,
semanticModel: updated.name, init: true }))
+ }
+ }
+
+ const onCopyDefinition = async () => {
+ try {
+ await copyToClipboard(definitionText)
+ message.success('Definition copied!')
+ } catch (err) {
+ console.error('Failed to copy definition: ', err)
+ message.error('Failed to copy definition')
+ }
+ }
+
+ const datasetColumns = useMemo(
+ () => [
+ {
+ title: 'Dataset Name',
+ dataIndex: 'name',
+ key: 'name',
+ width: 200,
+ ellipsis: true,
+ sorter: (a, b) =>
a.name.toLowerCase().localeCompare(b.name.toLowerCase())
+ },
+ {
+ title: 'Source',
+ dataIndex: 'source',
+ key: 'source',
+ width: 260,
+ ellipsis: true,
+ render: source => <span className='font-mono
text-xs'>{sourceFullName(source)}</span>
+ },
+ {
+ title: 'Primary Key',
+ dataIndex: 'primaryKey',
+ key: 'primaryKey',
+ width: 180,
+ ellipsis: true,
+ render: renderColumns
+ },
+ {
+ title: 'Unique Keys',
+ dataIndex: 'uniqueKeys',
+ key: 'uniqueKeys',
+ width: 220,
+ render: keys =>
+ keys?.length ? (
+ <Space direction='vertical' size={4}>
+ {keys.map((columns, index) => (
+ <Tag key={index}>{renderColumns(columns)}</Tag>
+ ))}
+ </Space>
+ ) : (
+ <span>-</span>
+ )
+ },
+ {
+ title: 'Fields',
+ dataIndex: 'fields',
+ key: 'fields',
+ width: 80,
+ render: fields => <span>{(fields || []).length}</span>
+ },
+ {
+ title: 'Description',
+ dataIndex: 'description',
+ key: 'description',
+ ellipsis: true,
+ render: description => <span>{description || '-'}</span>
+ }
+ ],
+ []
+ )
+
+ const fieldColumns = useMemo(
+ () => [
+ {
+ title: 'Field Name',
+ dataIndex: 'name',
+ key: 'name',
+ width: 220,
+ render: (name, field) => (
+ <div className='break-words'>
+ <div>{name}</div>
+ {field.label && <Typography.Text
type='secondary'>{field.label}</Typography.Text>}
+ </div>
+ )
+ },
+ {
+ title: 'Data Type',
+ dataIndex: 'datatype',
+ key: 'datatype',
+ width: 140,
+ render: datatype => (datatype ? <Tag>{datatype}</Tag> : <span>-</span>)
+ },
+ {
+ title: 'Time Dimension',
+ dataIndex: 'dimension',
+ key: 'dimension',
+ width: 140,
+ render: dimension => <span>{dimension?.isTime ? 'Yes' : 'No'}</span>
+ },
+ {
+ title: 'Expression',
+ dataIndex: 'expression',
+ key: 'expression',
+ render: renderExpression
+ },
+ {
+ title: 'Description',
+ dataIndex: 'description',
+ key: 'description',
+ ellipsis: true,
+ render: description => <span>{description || '-'}</span>
+ }
+ ],
+ []
+ )
+
+ const relationshipColumns = useMemo(
+ () => [
+ {
+ title: 'Relationship Name',
+ dataIndex: 'name',
+ key: 'name',
+ width: 220,
+ ellipsis: true,
+ sorter: (a, b) =>
a.name.toLowerCase().localeCompare(b.name.toLowerCase())
+ },
+ { title: 'From', dataIndex: 'from', key: 'from', width: 160, ellipsis:
true },
+ {
+ title: 'From Columns',
+ dataIndex: 'fromColumns',
+ key: 'fromColumns',
+ width: 200,
+ ellipsis: true,
+ render: renderColumns
+ },
+ { title: 'To', dataIndex: 'to', key: 'to', width: 160, ellipsis: true },
+ {
+ title: 'To Columns',
+ dataIndex: 'toColumns',
+ key: 'toColumns',
+ ellipsis: true,
+ render: renderColumns
+ }
+ ],
+ []
+ )
+
+ const metricColumns = useMemo(
+ () => [
+ {
+ title: 'Metric Name',
+ dataIndex: 'name',
+ key: 'name',
+ width: 200,
+ ellipsis: true,
+ sorter: (a, b) =>
a.name.toLowerCase().localeCompare(b.name.toLowerCase())
+ },
+ {
+ title: 'Data Type',
+ dataIndex: 'datatype',
+ key: 'datatype',
+ width: 140,
+ render: datatype => (datatype ? <Tag>{datatype}</Tag> : <span>-</span>)
+ },
+ {
+ title: 'Expression',
+ dataIndex: 'expression',
+ key: 'expression',
+ render: renderExpression
+ },
+ {
+ title: 'Description',
+ dataIndex: 'description',
+ key: 'description',
+ ellipsis: true,
+ render: description => <span>{description || '-'}</span>
+ }
+ ],
+ []
+ )
+
+ const tabOptions = [
+ { label: 'Datasets', key: 'Datasets' },
+ { label: 'Relationships', key: 'Relationships' },
+ { label: 'Metrics', key: 'Metrics' },
+ { label: 'Definition', key: 'Definition' }
+ ]
+
+ const {
+ resizableColumns: datasetResizableColumns,
+ components: datasetComponents,
+ tableWidth: datasetTableWidth
+ } = useAntdColumnResize(() => {
+ return { columns: datasetColumns, minWidth: 100 }
+ }, [datasetColumns])
+
+ const {
+ resizableColumns: relationshipResizableColumns,
+ components: relationshipComponents,
+ tableWidth: relationshipTableWidth
+ } = useAntdColumnResize(() => {
+ return { columns: relationshipColumns, minWidth: 100 }
+ }, [relationshipColumns])
+
+ const {
+ resizableColumns: metricResizableColumns,
+ components: metricComponents,
+ tableWidth: metricTableWidth
+ } = useAntdColumnResize(() => {
+ return { columns: metricColumns, minWidth: 100 }
+ }, [metricColumns])
+
+ const expandedFieldsRow = dataset => (
+ <div>
+ {renderMetadata(dataset, dataset.name)}
+ <Table
+ data-refer='semantic-model-fields-grid'
+ size='small'
+ rowKey={field => field.name}
+ dataSource={dataset.fields || []}
+ columns={fieldColumns}
+ pagination={false}
+ expandable={{
+ expandedRowRender: field => renderMetadata(field, field.name),
+ rowExpandable: hasMetadata
+ }}
+ />
+ </div>
+ )
+
+ return (
+ <>
+ <Spin spinning={store.activatedDetailsLoading}>
+ <Flex className='mb-2' gap='small' align='flex-start' ref={ref}>
+ <div className='size-8'>
+ <Icons.iconify icon='mdi:graph-outline' className='my-icon-large'
/>
+ </div>
+ <div className='grow-1 relative bottom-1'>
+ <Title level={3} style={{ marginBottom: '0.125rem' }}>
+ <Space>
+ <span
+ title={semanticModelName}
+ className='min-w-10 truncate'
+ style={{ maxWidth: `calc(${width}px - 90px)`, display:
'inherit' }}
+ >
+ {semanticModelName || ''}
+ </span>
+ <Tooltip title='Edit'>
+ <Button
+ type='text'
+ size='small'
+ aria-label='Edit Semantic Model'
+ icon={<Icons.Pencil className='size-4' />}
+ disabled={store.activatedDetailsLoading || !definition}
+ onClick={() => setOpenEdit(true)}
+ />
+ </Tooltip>
+ </Space>
+ </Title>
+ <Paragraph
+ type='secondary'
+ className='truncate'
+ title={semanticModel?.comment}
+ style={{ marginBottom: 0, maxWidth: `calc(${width}px - 56px)` }}
+ >
+ {semanticModel?.comment}
+ </Paragraph>
+ </div>
+ </Flex>
+ <Space split={<Divider type='vertical' />} wrap={true}
className='mb-2'>
+ {anthEnable && (
+ <Space size={4}>
+ <Tooltip title='Owned' placement='top'>
+ <Icons.User className='size-4' color='grey' />
+ </Tooltip>
+ <GetOwner
+ metalake={metalake}
+ metadataObjectType={'semantic_model'}
+ metadataObjectFullName={metadataObjectFullName}
+ />
+ </Space>
+ )}
+ {semanticModel?.audit?.creator && (
+ <Space size={4}>
+ <Tooltip title='Creator' placement='top'>
+ <Icons.UserPen className='size-4' color='grey' />
+ </Tooltip>
+ <span>{semanticModel.audit.creator}</span>
+ </Space>
+ )}
+ <Space size={4}>
+ <Tooltip title='Created' placement='top'>
+ <span className='inline-flex'>
+ <Icons.iconify icon='mdi:clock-outline' className='size-4'
props={{ color: 'grey' }} />
+ </span>
+ </Tooltip>
+ <span>{createdAtText}</span>
+ </Space>
+ <Space size={4}>
+ <Tooltip title='Tags' placement='top'>
+ <Icons.Tags className='size-4' color='grey' />
+ </Tooltip>
+ {store.currentEntityTags && store.currentEntityTags?.length > 0 ? (
+ <Popover placement='bottom' title={<span>Tags</span>}
content={tagContent}>
+ <a
className='text-defaultPrimary'>{store.currentEntityTags?.length}</a>
+ </Popover>
+ ) : (
+ <a className='text-defaultPrimary'>0</a>
+ )}
+ </Space>
+ <Space size={4}>
+ <Tooltip title='Properties' placement='top'>
+ <Icons.TableProperties className='size-4' color='grey' />
+ </Tooltip>
+ {properties && Object.keys(properties).length > 0 ? (
+ <Popover placement='bottom' title={<span>Properties</span>}
content={propertyContent}>
+ <a
className='text-defaultPrimary'>{Object.keys(properties).length}</a>
+ </Popover>
+ ) : (
+ <a className='text-defaultPrimary'>0</a>
+ )}
+ </Space>
+ {semanticModel?.audit?.lastModifier && (
+ <Space size={4} data-refer='semantic-model-last-modifier'>
+ <Tooltip title='Last modified by'>
+ <Icons.UserPen className='size-4' color='grey' />
+ </Tooltip>
+ <span>{semanticModel.audit.lastModifier}</span>
+ </Space>
+ )}
+ {lastModifiedAt && (
+ <Space size={4} data-refer='semantic-model-last-modified-time'>
+ <Tooltip title='Last modified'>
+ <Icons.History className='size-4' color='grey' />
+ </Tooltip>
+ <span>{lastModifiedText}</span>
+ </Space>
+ )}
+ </Space>
+ </Spin>
+ <SemanticModelExport
+ key={metadataObjectFullName}
+ metalake={metalake}
+ catalog={catalog}
+ schema={schema}
+ semanticModel={semanticModelName}
+ disabled={store.activatedDetailsLoading || !definition}
+ />
+ {renderMetadata(definition, 'Model')}
+ <Tabs data-refer='details-tabs' activeKey={tabKey} onChange={setTabKey}
items={tabOptions} />
+ <Spin spinning={store.activatedDetailsLoading}>
+ {tabKey === 'Datasets' && (
+ <Table
+ data-refer='semantic-model-datasets-grid'
+ size='small'
+ style={{ maxHeight: 'calc(100vh - 30rem)' }}
+ scroll={{ x: datasetTableWidth, y: 'calc(100vh - 37rem)' }}
+ dataSource={datasets}
+ columns={datasetResizableColumns}
+ components={datasetComponents}
+ expandable={{
+ expandedRowRender: expandedFieldsRow,
+ rowExpandable: dataset => (dataset.fields || []).length > 0 ||
hasMetadata(dataset)
+ }}
+ pagination={{ position: ['bottomCenter'], showSizeChanger: true }}
+ />
+ )}
+ {tabKey === 'Relationships' && (
+ <Table
+ data-refer='semantic-model-relationships-grid'
+ size='small'
+ style={{ maxHeight: 'calc(100vh - 30rem)' }}
+ scroll={{ x: relationshipTableWidth, y: 'calc(100vh - 37rem)' }}
+ dataSource={relationships}
+ columns={relationshipResizableColumns}
+ components={relationshipComponents}
+ expandable={{
+ expandedRowRender: relationship => renderMetadata(relationship,
relationship.name),
+ rowExpandable: hasMetadata
+ }}
+ pagination={{ position: ['bottomCenter'], showSizeChanger: true }}
+ />
+ )}
+ {tabKey === 'Metrics' && (
+ <Table
+ data-refer='semantic-model-metrics-grid'
+ size='small'
+ style={{ maxHeight: 'calc(100vh - 30rem)' }}
+ scroll={{ x: metricTableWidth, y: 'calc(100vh - 37rem)' }}
Review Comment:
The scrollbars and pagination are reachable on `6a368938a`, but the body is
again too small in a short window. With the existing sample at 1280×600, I
measured only 67px of usable height in Datasets and 82px in Metrics; an
expanded field section is about 168px tall and metric rows are 85–101px. A
whole field/metric cannot be read at once. The fixed
header/tabs/search/pagination consume most of the panel, and hiding outer
overflow forces everything into the remainder. Please add a compact
short-window layout or an outer-scroll fallback that preserves a usable body
and reachable horizontal scrollbar. The viewport check should verify readable
expanded content as well as scrollbar visibility.
##########
web-v2/web/src/lib/api/semanticModels/index.js:
##########
@@ -0,0 +1,94 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { defHttp } from '@/lib/utils/axios'
+
+const Apis = {
+ GET: ({ metalake, catalog, schema }) =>
+
`/api/metalakes/${encodeURIComponent(metalake)}/catalogs/${encodeURIComponent(
+ catalog
+ )}/schemas/${encodeURIComponent(schema)}/semantic-models`,
+ GET_DETAIL: ({ metalake, catalog, schema, semanticModel }) =>
+
`/api/metalakes/${encodeURIComponent(metalake)}/catalogs/${encodeURIComponent(
+ catalog
+
)}/schemas/${encodeURIComponent(schema)}/semantic-models/${encodeURIComponent(semanticModel)}`
+}
+
+export const getSemanticModelsApi = (params, options) => {
+ return defHttp.get(
+ {
+ url: `${Apis.GET(params)}`
+ },
+
+ // The schema tab and tree load this list independently and must not
cancel each other.
+ { ...options, ignoreCancelToken: true }
Review Comment:
There is another ordering gap on `6a368938a`: start a save in schema A,
navigate to schema B and let B's list load, then finish A's PUT.
`updateSemanticModel` unconditionally starts a new `fetchSemanticModels(A)`; it
becomes the latest list request and replaces B's visible list with A's models.
A controlled-order test using the real thunk/reducer fails with `['model_a']`
instead of `['model_b']` while B remains selected. The editor's mounted guard
runs after this refresh, so it cannot prevent it. Please scope the visible list
to the active schema while allowing A's tree/cache to refresh, and cover
mutation completion after navigation.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
