Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
},
"dependencies": {
"@formbricks/js": "^4.4.0",
"@lakekeeper/console-components": "github:lakekeeper/console-components#v0.13.1",
"@lakekeeper/console-components": "github:lakekeeper/console-components#v0.14.0",
"@mdi/font": "7.4.47",
"json-bigint": "^1.0.0",
"oidc-client-ts": "^3.3.0",
Expand Down
4 changes: 2 additions & 2 deletions src/assets/dependencies.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
{
"name": "@lakekeeper/console-components",
"version": "github:lakekeeper/console-components#v0.13.1"
"version": "github:lakekeeper/console-components#v0.14.0"
},
{
"name": "@mdi/font",
Expand Down Expand Up @@ -143,7 +143,7 @@
]
},
"components": {
"version": "0.13.1",
"version": "0.14.0",
"dependencies": [
{
"name": "@codemirror/commands",
Expand Down
13 changes: 0 additions & 13 deletions src/components/NavigationBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,6 @@
<v-icon size="small" icon="mdi-database"></v-icon>
</template>
</v-list-item>
<v-list-item link title="Volumes" to="/volumes" rounded="lg">
<template #prepend>
<v-tooltip activator="parent" location="end" :disabled="visual.navBarShow">
Volumes
</v-tooltip>
<v-icon size="small" icon="mdi-bucket"></v-icon>
</template>
<template #append>
<v-chip v-show="visual.navBarShow" size="x-small" color="warning" variant="tonal">
Roadmap
</v-chip>
</template>
</v-list-item>
<v-divider class="my-2"></v-divider>

<v-list-subheader v-show="visual.navBarShow" class="text-uppercase font-weight-bold">
Expand Down
37 changes: 0 additions & 37 deletions src/pages/volumes.vue

This file was deleted.

14 changes: 10 additions & 4 deletions src/pages/warehouse/[id].namespace.[nsid].generic-table.[tid].vue
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@
<GenericTableHeader
:warehouse-id="params.id"
:namespace-id="params.nsid"
:table-name="params.tid" />
:table-name="params.tid"
:entity-label="tableFormat === 'dataset' ? 'dataset' : undefined" />

<div v-if="loading" class="d-flex justify-center align-center pa-8">
<v-progress-circular indeterminate color="primary" />
Expand Down Expand Up @@ -85,7 +86,8 @@
v-if="tab === 'details'"
:warehouse-id="params.id"
:namespace-id="params.nsid"
:table-name="params.tid" />
:table-name="params.tid"
:entity-label="tableFormat === 'dataset' ? 'dataset' : undefined" />
</v-tabs-window-item>

<v-tabs-window-item value="files">
Expand All @@ -94,7 +96,8 @@
:warehouse-id="params.id"
:namespace-id="params.nsid"
:entity-name="params.tid"
entity-type="generic-table" />
entity-type="generic-table"
:can-write="tableFormat === 'dataset'" />
</v-tabs-window-item>

<v-tabs-window-item v-if="showPermissionsTab" value="permissions">
Expand Down Expand Up @@ -147,6 +150,7 @@ const router = useRouter();
const visual = useVisualStore();
const tab = ref('details');
const genericTableId = ref('');
const tableFormat = ref<string | null>(null);
const lastRequest = ref(0);
const pageError = ref<'forbidden' | 'not-found' | null>(null);
const loading = ref(true);
Expand Down Expand Up @@ -251,12 +255,14 @@ async function loadGenericTableMetadata() {
const { id, nsid, tid } = params.value;
const requestToken = ++lastRequest.value;
genericTableId.value = '';
tableFormat.value = null;
pageError.value = null;
loading.value = true;
try {
// loadGenericTable returns format/base-location/properties but no id; resolve
// the id via listGenericTables so PermissionManager/TaskManager get a UUID.
await functions.loadGenericTable(id, nsid, tid, false);
const gtResponse = await functions.loadGenericTable(id, nsid, tid, false);
tableFormat.value = gtResponse?.table?.format ?? null;
if (requestToken !== lastRequest.value) return;
const data = await functions.listGenericTables(id, nsid, undefined, false);
if (requestToken !== lastRequest.value) return;
Expand Down
16 changes: 16 additions & 0 deletions src/pages/warehouse/[id].namespace.[nsid].vue
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
<v-tab value="namespaces">namespaces</v-tab>
<v-tab value="tables">tables</v-tab>
<v-tab value="views">views</v-tab>
<v-tab value="datasets">datasets</v-tab>
<v-tab value="deleted">deleted</v-tab>
<v-tab v-if="showPermissionsTab" value="permissions">Permissions</v-tab>
</v-tabs>
Expand Down Expand Up @@ -113,6 +114,15 @@
:storage-layout="storageLayout" />
</v-tabs-window-item>

<v-tabs-window-item value="datasets">
<DatasetsList
v-if="tab === 'datasets'"
:warehouse-id="params.id"
:namespace-path="namespacePath"
class="pa-4"
@select="handleDatasetSelect" />
</v-tabs-window-item>

<v-tabs-window-item value="deleted">
<NamespaceDeleted
v-if="tab === 'deleted'"
Expand Down Expand Up @@ -144,6 +154,7 @@ import {
useVisualStore,
isForbiddenError,
isNotFoundError,
DatasetsList,
} from '@lakekeeper/console-components';

const route = useRoute();
Expand Down Expand Up @@ -298,6 +309,11 @@ async function loadNamespaceMetadata() {
}
}

function handleDatasetSelect(item: { name: string; namespaceId: string }) {
const nsid = item.namespaceId.split('.').join('\x1F');
router.push(`/warehouse/${params.value.id}/namespace/${nsid}/generic-table/${item.name}`);
}

// Handle table creation - force refresh of table list
function onTableCreated() {
tableListKey.value++; // Increment key to force re-render of NamespaceTables
Expand Down
15 changes: 0 additions & 15 deletions src/typed-router.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -136,13 +136,6 @@ declare module 'vue-router/auto-routes' {
Record<never, never>,
| never
>,
'/volumes': RouteRecordInfo<
'/volumes',
'/volumes',
Record<never, never>,
Record<never, never>,
| never
>,
'/warehouse/': RouteRecordInfo<
'/warehouse/',
'/warehouse',
Expand Down Expand Up @@ -318,14 +311,6 @@ declare module 'vue-router/auto-routes' {
pathParamNames:
| never
}
'src/pages/volumes.vue': {
routes:
| '/volumes'
views:
| never
pathParamNames:
| never
}
'src/pages/warehouse/index.vue': {
routes:
| '/warehouse/'
Expand Down
Loading