github
/
nocodb
mirror of https://github.com/nocodb/nocodb
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

chore(gui-v2): remove unused files 

Signed-off-by: Pranav C <pranavxc@gmail.com>
pull/2990/head
Pranav C 2 years ago
parent
2a99584a33
commit
e751a7aeae
9 changed files with 215 additions and 336 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      packages/nc-gui-v2/components/virtual-cell/BelongsTo.vue
  2. 9
      packages/nc-gui-v2/components/virtual-cell/HasMany.vue
  3. 40
      packages/nc-gui-v2/components/virtual-cell/ManyToMany.vue
  4. 62
      packages/nc-gui-v2/composables/columns/useLTARColumn.ts
  5. 3
      packages/nc-gui-v2/composables/index.ts
  6. 19
      packages/nc-gui-v2/composables/useBelongsTo.ts
  7. 19
      packages/nc-gui-v2/composables/useHasMany.ts
  8. 371
      packages/nc-gui-v2/composables/useLTARStore.ts
  9. 19
      packages/nc-gui-v2/composables/useManyToMany.ts

9
packages/nc-gui-v2/components/virtual-cell/BelongsTo.vue
Unescape View File

@ -17,7 +17,7 @@ const listItemsDlg = ref(false)
const { relatedTableMeta, loadRelatedTableMeta, relatedTablePrimaryValueProp, unlink } = useProvideLTARStore( const { relatedTableMeta, loadRelatedTableMeta, relatedTablePrimaryValueProp, unlink } = useProvideLTARStore(
column as Required<ColumnType>, column as Required<ColumnType>,
row, row,
() => reloadTrigger?.trigger() () => reloadTrigger?.trigger(),
) )
await loadRelatedTableMeta() await loadRelatedTableMeta()
</script> </script>
@ -34,11 +34,12 @@ await loadRelatedTableMeta()
<ListItems v-model="listItemsDlg" /> <ListItems v-model="listItemsDlg" />
</div> </div>
</template> </template>
<style scoped> <style scoped>
.nc-action-icon{ .nc-action-icon {
@apply hidden @apply hidden;
} }
.chips-wrapper:hover .nc-action-icon { .chips-wrapper:hover .nc-action-icon {
@apply inline-block @apply inline-block;
} }
</style> </style>

9
packages/nc-gui-v2/components/virtual-cell/HasMany.vue
Unescape View File

@ -19,7 +19,7 @@ const childListDlg = ref(false)
const { relatedTableMeta, loadRelatedTableMeta, relatedTablePrimaryValueProp, unlink } = useProvideLTARStore( const { relatedTableMeta, loadRelatedTableMeta, relatedTablePrimaryValueProp, unlink } = useProvideLTARStore(
column as Required<ColumnType>, column as Required<ColumnType>,
row, row,
() => reloadTrigger?.trigger() () => reloadTrigger?.trigger(),
) )
await loadRelatedTableMeta() await loadRelatedTableMeta()
</script> </script>
@ -39,11 +39,12 @@ await loadRelatedTableMeta()
<ListChildItems v-model="childListDlg" /> <ListChildItems v-model="childListDlg" />
</div> </div>
</template> </template>
<style scoped> <style scoped>
.nc-action-icon{ .nc-action-icon {
@apply hidden @apply hidden;
} }
.chips-wrapper:hover .nc-action-icon { .chips-wrapper:hover .nc-action-icon {
@apply inline-block @apply inline-block;
} }
</style> </style>

40
packages/nc-gui-v2/components/virtual-cell/ManyToMany.vue
Unescape View File

@ -19,44 +19,42 @@ const childListDlg = ref(false)
const { relatedTableMeta, loadRelatedTableMeta, relatedTablePrimaryValueProp, unlink } = useProvideLTARStore( const { relatedTableMeta, loadRelatedTableMeta, relatedTablePrimaryValueProp, unlink } = useProvideLTARStore(
column as Required<ColumnType>, column as Required<ColumnType>,
row, row,
() => reloadTrigger?.trigger() () => reloadTrigger?.trigger(),
) )
await loadRelatedTableMeta() await loadRelatedTableMeta()
</script> </script>
<template> <template>
<div class="flex align-center gap-1 w-full h-full chips-wrapper"> <div class="flex align-center gap-1 w-full h-full chips-wrapper">
<!-- <template v-if="!isForm"> --> <!-- <template v-if="!isForm"> -->
<div class="chips flex align-center img-container flex-grow hm-items flex-nowrap min-w-0 overflow-hidden"> <div class="chips flex align-center img-container flex-grow hm-items flex-nowrap min-w-0 overflow-hidden">
<template v-if="value"> <template v-if="value">
<ItemChip v-for="(ch, i) in value" :key="i" :value="ch[relatedTablePrimaryValueProp]" @unlink="unlink(ch)" /> <ItemChip v-for="(ch, i) in value" :key="i" :value="ch[relatedTablePrimaryValueProp]" @unlink="unlink(ch)" />
<!-- <!--
:active="active" :item="ch" :active="active" :item="ch"
:value="getCellValue(ch)" :value="getCellValue(ch)"
:readonly="isLocked || isPublic" :readonly="isLocked || isPublic"
@edit="editChild" @edit="editChild"
@unlink="unlinkChild " --> @unlink="unlinkChild " -->
<span v-if="value?.length === 10" class="caption pointer ml-1 grey--text" @click="childListDlg = true">more... </span> <span v-if="value?.length === 10" class="caption pointer ml-1 grey--text" @click="childListDlg = true">more... </span>
</template> </template>
</div>
<div class="flex-1"/>
<MdiExpandIcon
class="nc-action-icon text-gray-500/50 hover:text-gray-500"
@click="childListDlg = true"
/>
<MdiPlusIcon class="nc-action-icon w-[20px] text-gray-500/50 hover:text-gray-500" @click="listItemsDlg = true" />
<ListItems v-model="listItemsDlg" />
<ListChildItems v-model="childListDlg" />
</div> </div>
<div class="flex-1" />
<MdiExpandIcon class="nc-action-icon text-gray-500/50 hover:text-gray-500" @click="childListDlg = true" />
<MdiPlusIcon class="nc-action-icon w-[20px] text-gray-500/50 hover:text-gray-500" @click="listItemsDlg = true" />
<ListItems v-model="listItemsDlg" />
<ListChildItems v-model="childListDlg" />
</div>
</template> </template>
<style scoped> <style scoped>
.nc-action-icon{ .nc-action-icon {
@apply hidden @apply hidden;
} }
.chips-wrapper:hover .nc-action-icon { .chips-wrapper:hover .nc-action-icon {
@apply inline-block @apply inline-block;
} }
</style> </style>

62
packages/nc-gui-v2/composables/columns/useLTARColumn.ts
Unescape View File

@ -1,62 +0,0 @@
import type { ColumnType, LinkToAnotherRecordType, TableType } from 'nocodb-sdk'
import type { Ref } from 'vue'
export default (column: Ref<ColumnType>) => {
const { $api } = useNuxtApp()
const { metas, getMeta } = useMetas()
const colOptions = computed<LinkToAnotherRecordType>(() => column.value.colOptions as LinkToAnotherRecordType)
const relatedTableMeta = computed<TableType>(
() => colOptions?.value && metas.value?.[colOptions.value?.fk_related_model_id as string],
)
const removeChild = () => {
// todo: audit
// await this.$api.dbTableRow.nestedRemove(
// 'noco',
// this.projectName,
// this.meta.title,
// id,
// 'bt',
// this.column.title,
// parent[this.parentPrimaryKey]
// );
}
const addChild = () => {
// await this.$api.dbTableRow.nestedAdd('noco', this.projectName, this.meta.title, id, 'bt', this.column.title, pid);
}
const loadRelatedTableMeta = async () => {
return getMeta(colOptions.value?.fk_related_model_id as string)
}
// this.data = await this.$api.dbTableRow.nestedChildrenExcludedList(
// 'noco',
// this.projectName,
// this.parentMeta.title,
// this.rowId,
// this.column.colOptions.type,
// this.column.title,
// {
// limit: this.size,
// offset: this.size * (this.page - 1),
// where: this.query && `(${this.primaryCol},like,${this.query})`,
// }
// );
// this.data = await this.$api.dbTableRow.nestedList(
// 'noco',
// this.projectName,
// this.parentMeta.title,
// this.rowId,
// this.column.colOptions.type,
// this.column.title,
// {
// limit: this.size,
// offset: this.size * (this.page - 1),
// }
// );
return { addChild, removeChild, loadRelatedTableMeta, relatedTableMeta }
}

3
packages/nc-gui-v2/composables/index.ts
Unescape View File

@ -3,12 +3,9 @@ export * from './useGlobal'
export * from './useInjectionState' export * from './useInjectionState'
export * from './useUIPermission' export * from './useUIPermission'
export * from './useAttachment' export * from './useAttachment'
export * from './useBelongsTo'
export * from './useColors' export * from './useColors'
export * from './useColumn' export * from './useColumn'
export * from './useGridViewColumnWidth' export * from './useGridViewColumnWidth'
export * from './useHasMany'
export * from './useManyToMany'
export * from './useMetas' export * from './useMetas'
export * from './useProject' export * from './useProject'
export * from './useTable' export * from './useTable'

19
packages/nc-gui-v2/composables/useBelongsTo.ts
Unescape View File

@ -1,19 +0,0 @@
import type { ColumnType, TableType } from 'nocodb-sdk'
import { useMetas } from './useMetas'
export function useBelongsTo(column: ColumnType) {
const { metas, getMeta } = useMetas()
const parentMeta = computed<TableType>(() => {
return metas.value?.[(column.colOptions as any)?.fk_related_model_id as string]
})
const loadParentMeta = async () => {
await getMeta((column.colOptions as any)?.fk_related_model_id as string)
}
const primaryValueProp = computed(() => {
return (parentMeta?.value?.columns?.find((c) => c.pv) || parentMeta?.value?.columns?.[0])?.title
})
return { parentMeta, loadParentMeta, primaryValueProp }
}

19
packages/nc-gui-v2/composables/useHasMany.ts
Unescape View File

@ -1,19 +0,0 @@
import type { ColumnType, TableType } from 'nocodb-sdk'
import { useMetas } from './useMetas'
export function useHasMany(column: ColumnType) {
const { metas, getMeta } = useMetas()
const childMeta = computed<TableType>(() => {
return metas.value?.[(column.colOptions as any)?.fk_related_model_id as string]
})
const loadChildMeta = async () => {
await getMeta((column.colOptions as any)?.fk_related_model_id as string)
}
const primaryValueProp = computed(() => {
return (childMeta?.value?.columns?.find((c) => c.pv) || childMeta?.value?.columns?.[0])?.title
})
return { childMeta, loadChildMeta, primaryValueProp }
}

371
packages/nc-gui-v2/composables/useLTARStore.ts
Unescape View File

@ -1,8 +1,6 @@
import type { ColumnType, LinkToAnotherRecordType, PaginatedType, TableType } from 'nocodb-sdk' import type { ColumnType, LinkToAnotherRecordType, PaginatedType, TableType } from 'nocodb-sdk'
import type { Ref } from 'vue' import type { Ref } from 'vue'
import { useMetas } from './useMetas' import { useInjectionState, useMetas, useProject } from '#imports'
import { useInjectionState } from '#imports'
import { useProject } from '~/composables/useProject'
import { NOCO } from '~/lib' import { NOCO } from '~/lib'
import type { Row } from '~/composables' import type { Row } from '~/composables'
@ -11,190 +9,193 @@ interface DataApiResponse {
pageInfo: PaginatedType pageInfo: PaginatedType
} }
const [useProvideLTARStore, useLTARStore] = useInjectionState((column: Required<ColumnType>, row?: Ref<Row>, reloadData = () => {}) => { const [useProvideLTARStore, useLTARStore] = useInjectionState(
// state (column: Required<ColumnType>, row?: Ref<Row>, reloadData = () => {}) => {
const { metas, getMeta } = useMetas() // state
const { project } = useProject() const { metas, getMeta } = useMetas()
const { $api } = useNuxtApp() const { project } = useProject()
const childrenExcludedList: Ref<DataApiResponse | undefined> = ref() const { $api } = useNuxtApp()
const childrenList: Ref<DataApiResponse | undefined> = ref() const childrenExcludedList: Ref<DataApiResponse | undefined> = ref()
const childrenExcludedListPagination = reactive({ const childrenList: Ref<DataApiResponse | undefined> = ref()
page: 1, const childrenExcludedListPagination = reactive({
query: '', page: 1,
size: 10, query: '',
}) size: 10,
const childrenListPagination = reactive({ })
page: 1, const childrenListPagination = reactive({
query: '', page: 1,
size: 10, query: '',
}) size: 10,
})
const colOptions = column.colOptions as LinkToAnotherRecordType
const colOptions = column.colOptions as LinkToAnotherRecordType
// getters
const meta = computed(() => metas?.value?.[column.fk_model_id as string]) // getters
const relatedTableMeta = computed<TableType>(() => { const meta = computed(() => metas?.value?.[column.fk_model_id as string])
return metas.value?.[(column.colOptions as any)?.fk_related_model_id as string] const relatedTableMeta = computed<TableType>(() => {
}) return metas.value?.[(column.colOptions as any)?.fk_related_model_id as string]
})
const rowId = computed(() =>
meta.value.columns const rowId = computed(() =>
.filter((c: Required<ColumnType>) => c.pk) meta.value.columns
.map((c: Required<ColumnType>) => row?.value?.row?.[c.title]) .filter((c: Required<ColumnType>) => c.pk)
.join('___'), .map((c: Required<ColumnType>) => row?.value?.row?.[c.title])
) .join('___'),
// actions
const getRelatedTableRowId = (row: Record<string, any>) => {
return relatedTableMeta.value?.columns
?.filter((c) => c.pk)
.map((c) => row?.[c.title as string])
.join('___')
}
const loadRelatedTableMeta = async () => {
await getMeta(colOptions?.fk_related_model_id as string)
}
const relatedTablePrimaryValueProp = computed(() => {
return (relatedTableMeta?.value?.columns?.find((c) => c.pv) || relatedTableMeta?.value?.columns?.[0])?.title
})
const primaryValueProp = computed(() => {
return (meta?.value?.columns?.find((c) => c.pv) || relatedTableMeta?.value?.columns?.[0])?.title
})
const loadChildrenExcludedList = async () => {
childrenExcludedList.value = await $api.dbTableRow.nestedChildrenExcludedList(
NOCO,
project.value.id as string,
meta.value.id,
rowId.value,
(column.colOptions as LinkToAnotherRecordType).type as 'mm' | 'hm',
column.title,
// todo: swagger type correction
{
limit: childrenExcludedListPagination.size,
offset: childrenExcludedListPagination.size * (childrenExcludedListPagination.page - 1),
where:
childrenExcludedListPagination.query &&
`(${relatedTablePrimaryValueProp.value},like,${childrenExcludedListPagination.query})`,
} as any,
)
}
const loadChildrenList = async () => {
childrenList.value = await $api.dbTableRow.nestedList(
NOCO,
project.value.id as string,
meta.value.id,
rowId.value,
colOptions.type as 'mm' | 'hm',
column.title,
// todo: swagger type correction
{
limit: childrenListPagination.size,
offset: childrenListPagination.size * (childrenListPagination.page - 1),
where: childrenListPagination.query && `(${relatedTablePrimaryValueProp.value},like,${childrenListPagination.query})`,
} as any,
)
}
const unlink = async (row: Record<string, any>) => {
// const column = meta.columns.find(c => c.id === this.column.colOptions.fk_child_column_id);
// todo: handle if new record
// if (this.isNew) {
// this.$emit('updateCol', this.row, _cn, null);
// this.localState = null;
// this.$emit('update:localState', this.localState);
// return;
// }
// todo: handle bt column if required
// if (column.rqd) {
// this.$toast.info('Unlink is not possible, instead map to another parent.').goAway(3000);
// return;
// }
// todo: audit
await $api.dbTableRow.nestedRemove(
NOCO,
project.value.title as string,
meta.value.title,
rowId.value,
colOptions.type as 'mm' | 'hm',
column.title,
getRelatedTableRowId(row) as string,
)
reloadData?.()
// todo: reload table data and children list
// this.$emit('loadTableData');
// if (this.isForm && this.$refs.childList) {
// this.$refs.childList.loadData();
// }
}
const link = async (row: Record<string, any>) => {
// todo: handle new record
// const pid = this._extractRowId(parent, this.parentMeta);
// const id = this._extractRowId(this.row, this.meta);
// const _cn = this.meta.columns.find(c => c.id === this.column.colOptions.fk_child_column_id).title;
//
// if (this.isNew) {
// const _rcn = this.parentMeta.columns.find(c => c.id === this.column.colOptions.fk_parent_column_id).title;
// this.localState = parent;
// this.$emit('update:localState', this.localState);
// this.$emit('updateCol', this.row, _cn, parent[_rcn]);
// this.newRecordModal = false;
// return;
// }
await $api.dbTableRow.nestedAdd(
NOCO,
project.value.title as string,
meta.value.title as string,
rowId.value,
colOptions.type as 'mm' | 'hm',
column.title,
getRelatedTableRowId(row) as string,
) )
// todo: reload table data and child list // actions
// this.pid = pid; const getRelatedTableRowId = (row: Record<string, any>) => {
// return relatedTableMeta.value?.columns
// this.newRecordModal = false; ?.filter((c) => c.pk)
// .map((c) => row?.[c.title as string])
// this.$emit('loadTableData'); .join('___')
// if (this.isForm && this.$refs.childList) { }
// this.$refs.childList.loadData();
// } const loadRelatedTableMeta = async () => {
await getMeta(colOptions?.fk_related_model_id as string)
reloadData?.() }
}
const relatedTablePrimaryValueProp = computed(() => {
// watchers return (relatedTableMeta?.value?.columns?.find((c) => c.pv) || relatedTableMeta?.value?.columns?.[0])?.title
watch(childrenExcludedListPagination, async () => { })
await loadChildrenExcludedList() const primaryValueProp = computed(() => {
}) return (meta?.value?.columns?.find((c: Required<ColumnType>) => c.pv) || relatedTableMeta?.value?.columns?.[0])?.title
watch(childrenListPagination, async () => { })
await loadChildrenList()
}) const loadChildrenExcludedList = async () => {
childrenExcludedList.value = await $api.dbTableRow.nestedChildrenExcludedList(
return { NOCO,
relatedTableMeta, project.value.id as string,
loadRelatedTableMeta, meta.value.id,
relatedTablePrimaryValueProp, rowId.value,
childrenExcludedList, (column.colOptions as LinkToAnotherRecordType).type as 'mm' | 'hm',
childrenList, column.title,
rowId, // todo: swagger type correction
childrenExcludedListPagination, {
childrenListPagination, limit: childrenExcludedListPagination.size,
primaryValueProp, offset: childrenExcludedListPagination.size * (childrenExcludedListPagination.page - 1),
meta, where:
unlink, childrenExcludedListPagination.query &&
link, `(${relatedTablePrimaryValueProp.value},like,${childrenExcludedListPagination.query})`,
loadChildrenExcludedList, } as any,
loadChildrenList, )
row, }
}
}, 'ltar-store') const loadChildrenList = async () => {
childrenList.value = await $api.dbTableRow.nestedList(
NOCO,
project.value.id as string,
meta.value.id,
rowId.value,
colOptions.type as 'mm' | 'hm',
column.title,
// todo: swagger type correction
{
limit: childrenListPagination.size,
offset: childrenListPagination.size * (childrenListPagination.page - 1),
where: childrenListPagination.query && `(${relatedTablePrimaryValueProp.value},like,${childrenListPagination.query})`,
} as any,
)
}
const unlink = async (row: Record<string, any>) => {
// const column = meta.columns.find(c => c.id === this.column.colOptions.fk_child_column_id);
// todo: handle if new record
// if (this.isNew) {
// this.$emit('updateCol', this.row, _cn, null);
// this.localState = null;
// this.$emit('update:localState', this.localState);
// return;
// }
// todo: handle bt column if required
// if (column.rqd) {
// this.$toast.info('Unlink is not possible, instead map to another parent.').goAway(3000);
// return;
// }
// todo: audit
await $api.dbTableRow.nestedRemove(
NOCO,
project.value.title as string,
meta.value.title,
rowId.value,
colOptions.type as 'mm' | 'hm',
column.title,
getRelatedTableRowId(row) as string,
)
reloadData?.()
// todo: reload table data and children list
// this.$emit('loadTableData');
// if (this.isForm && this.$refs.childList) {
// this.$refs.childList.loadData();
// }
}
const link = async (row: Record<string, any>) => {
// todo: handle new record
// const pid = this._extractRowId(parent, this.parentMeta);
// const id = this._extractRowId(this.row, this.meta);
// const _cn = this.meta.columns.find(c => c.id === this.column.colOptions.fk_child_column_id).title;
//
// if (this.isNew) {
// const _rcn = this.parentMeta.columns.find(c => c.id === this.column.colOptions.fk_parent_column_id).title;
// this.localState = parent;
// this.$emit('update:localState', this.localState);
// this.$emit('updateCol', this.row, _cn, parent[_rcn]);
// this.newRecordModal = false;
// return;
// }
await $api.dbTableRow.nestedAdd(
NOCO,
project.value.title as string,
meta.value.title as string,
rowId.value,
colOptions.type as 'mm' | 'hm',
column.title,
getRelatedTableRowId(row) as string,
)
// todo: reload table data and child list
// this.pid = pid;
//
// this.newRecordModal = false;
//
// this.$emit('loadTableData');
// if (this.isForm && this.$refs.childList) {
// this.$refs.childList.loadData();
// }
reloadData?.()
}
// watchers
watch(childrenExcludedListPagination, async () => {
await loadChildrenExcludedList()
})
watch(childrenListPagination, async () => {
await loadChildrenList()
})
return {
relatedTableMeta,
loadRelatedTableMeta,
relatedTablePrimaryValueProp,
childrenExcludedList,
childrenList,
rowId,
childrenExcludedListPagination,
childrenListPagination,
primaryValueProp,
meta,
unlink,
link,
loadChildrenExcludedList,
loadChildrenList,
row,
}
},
'ltar-store',
)
export { useProvideLTARStore } export { useProvideLTARStore }

19
packages/nc-gui-v2/composables/useManyToMany.ts
Unescape View File

@ -1,19 +0,0 @@
import type { ColumnType, TableType } from 'nocodb-sdk'
import { useMetas } from './useMetas'
export function useManyToMany(column: ColumnType) {
const { metas, getMeta } = useMetas()
const childMeta = computed<TableType>(() => {
return metas.value?.[(column.colOptions as any)?.fk_related_model_id as string]
})
const loadChildMeta = async () => {
await getMeta((column.colOptions as any)?.fk_related_model_id as string)
}
const primaryValueProp = computed(() => {
return (childMeta?.value?.columns?.find((c) => c.pv) || childMeta?.value?.columns?.[0])?.title
})
return { childMeta, loadChildMeta, primaryValueProp }
}
Write Preview
Loading…
Cancel
Save