mirror of
https://github.com/nocodb/nocodb.git
synced 2026-04-30 01:56:38 +00:00
feat: Improved UI (#6222)
* feat: Improved ui (#6156) * refactor: revert Signed-off-by: Pranav C <pranavxc@gmail.com> feat: shared base Signed-off-by: Pranav C <pranavxc@gmail.com> fix: remove duplicate import statement Signed-off-by: Pranav C <pranavxc@gmail.com> fix: disable starred & license menu Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> test: fix airtable wait issue Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> test: enable mysql in ci Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> test: fix checkbox order for sqlite Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> test: disable quick tests Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> test: fix dbType env variable for CI Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> test: workspace API access error fix Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> test: enable SQLite CI CD Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> test: use DB_TYPE env variable Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> test: enable SQLite UT Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> test: isHub cleanup Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> test: add check for EE Timezone spec Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> chore: cleanup Signed-off-by: Pranav C <pranavxc@gmail.com> chore: cleanup Signed-off-by: Pranav C <pranavxc@gmail.com> test: EE check fix Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> chore: test correction Signed-off-by: Pranav C <pranavxc@gmail.com> chore: sync latest changes Signed-off-by: Pranav C <pranavxc@gmail.com> test: set EE=false Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> test: set NC Edition to community in workflow file Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> chore: update sdk build command Signed-off-by: Pranav C <pranavxc@gmail.com> refactor: i18n and other changes Signed-off-by: Pranav C <pranavxc@gmail.com> feat: new ui Signed-off-by: Pranav C <pranavxc@gmail.com> * chore: sync tests Signed-off-by: Pranav C <pranavxc@gmail.com> * chore: lint Signed-off-by: Pranav C <pranavxc@gmail.com> * fix: shared view/base related bugs Signed-off-by: Pranav C <pranavxc@gmail.com> * test: checkbox verification sort order fix Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: fix sqlite reset Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: enable selfhosted runners Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * docs: table ops (draft) Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * Docs: screenshots for table-operations.md * refactor: introduce missing buttons Signed-off-by: Pranav C <pranavxc@gmail.com> * fix: get all fields Signed-off-by: Pranav C <pranavxc@gmail.com> * test: UT fix- new data API response Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: EE is false Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: webhook lookup as string in CE Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * fix: include created_at and updated_at Signed-off-by: Pranav C <pranavxc@gmail.com> * test: fix UT newDataAPI response for PG Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * fix: separate api for webhook related plugins Signed-off-by: Pranav C <pranavxc@gmail.com> * test: msyql filter corrections Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: mysql group by test corrections Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: fix datatype for rating field in groupby spec for pg Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: kanban datatype correction Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: column edit for mysql- rating field Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: misc fixes Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: enable 4 workers Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: enable 2 workers per shard only Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * docs: table CRUD * Rename table-operations.md to table-crud.md * Create column-crud.md * docs: row CRUD * Rename row.md to row-crud.md * docs: project crud * docs: toolbar (skeleton) * refactor: single page UI and bug fixes Signed-off-by: Pranav C <pranavxc@gmail.com> * chore: sync tests playwright Signed-off-by: Pranav C <pranavxc@gmail.com> * chore: add missing dependency Signed-off-by: Pranav C <pranavxc@gmail.com> * feat: single page ui, test corrections Signed-off-by: Pranav C <pranavxc@gmail.com> * chore: tests Signed-off-by: Pranav C <pranavxc@gmail.com> * test: project rename test correction Signed-off-by: Pranav C <pranavxc@gmail.com> * chore: remove only Signed-off-by: Pranav C <pranavxc@gmail.com> * test: remove wrong import statement Signed-off-by: Pranav C <pranavxc@gmail.com> * fix: delete option not visible in project context menu Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: move ws access within isEE() Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: fix groupby * test: groupby fix Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * docs: signup & landing page * docs: project crud * docs: project-crud misc * docs: toolbar fields * docs: toolbar / filters * docs: toolbar / group by * docs: toolbar / sort * docs: toolbar / row height * docs: filters additional options * docs: file re-order Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * docs: add links to column types * docs: code snippets * docs: links * docs: lookup * docs: rollup * docs: formula * docs: primary key * docs: display value * docs: development setup * docs: swagger * fix(nc-gui): encodeURIComponent for row id - closes: #6202 * docs: language * docs: expanded record * docs: import airtable * docs: airtable * docs: webhook * docs: revert file rename Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * docs: account settings * docs: audit * docs: meta management * docs: project settings * docs: shared base * docs: shared view * docs: meta sync * docs: team-auth * docs: views * docs: fix URL * docs: URL corrections * fix: shared base, view related bugs Signed-off-by: Pranav C <pranavxc@gmail.com> * test: EE check for WSaccess Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: exclude EE tests Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * fix: missing project delete closes #6215 Signed-off-by: Pranav C <pranavxc@gmail.com> * fix: merge existing project meta if found closes #6216 Signed-off-by: Pranav C <pranavxc@gmail.com> * fix: merge existing project meta if found closes #6216 Signed-off-by: Pranav C <pranavxc@gmail.com> --------- Signed-off-by: Pranav C <pranavxc@gmail.com> Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> Co-authored-by: Raju Udava <86527202+dstala@users.noreply.github.com> Co-authored-by: DarkPhoenix2704 <anbarasun123@gmail.com> Co-authored-by: Wing-Kam Wong <wingkwong.code@gmail.com> * refactor: docs and other bug fixes Signed-off-by: Pranav C <pranavxc@gmail.com> * feat: populate default project on super admin signup Signed-off-by: Pranav C <pranavxc@gmail.com> * fix: include created project details in signup response if avail, missing Dockerfile Signed-off-by: Pranav C <pranavxc@gmail.com> * chore: use custom function for resolving ts path aliases Signed-off-by: Pranav C <pranavxc@gmail.com> * chore: add missing generate script Signed-off-by: Pranav C <pranavxc@gmail.com> * chore: webpack build correction - ts path resolve Signed-off-by: Pranav C <pranavxc@gmail.com> --------- Signed-off-by: Pranav C <pranavxc@gmail.com> Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> Co-authored-by: mertmit <mertmit99@gmail.com> Co-authored-by: Raju Udava <86527202+dstala@users.noreply.github.com> Co-authored-by: DarkPhoenix2704 <anbarasun123@gmail.com> Co-authored-by: Wing-Kam Wong <wingkwong.code@gmail.com>
This commit is contained in:
Pranav C
130
packages/nc-gui/helpers/parsers/JSONTemplateAdapter.ts
Normal file
130
packages/nc-gui/helpers/parsers/JSONTemplateAdapter.ts
Normal file
@@ -0,0 +1,130 @@
|
||||
import { UITypes } from 'nocodb-sdk'
|
||||
import { getCheckboxValue, getColumnUIDTAndMetas } from './parserHelpers'
|
||||
import TemplateGenerator from './TemplateGenerator'
|
||||
|
||||
const jsonTypeToUidt: Record<string, string> = {
|
||||
number: UITypes.Number,
|
||||
string: UITypes.SingleLineText,
|
||||
date: UITypes.DateTime,
|
||||
boolean: UITypes.Checkbox,
|
||||
object: UITypes.JSON,
|
||||
}
|
||||
|
||||
const extractNestedData: any = (obj: any, path: any) => path.reduce((val: any, key: any) => val && val[key], obj)
|
||||
|
||||
export default class JSONTemplateAdapter extends TemplateGenerator {
|
||||
config: Record<string, any>
|
||||
data: Record<string, any>
|
||||
_jsonData: string | Record<string, any>
|
||||
jsonData: Record<string, any>
|
||||
project: {
|
||||
tables: Record<string, any>[]
|
||||
}
|
||||
|
||||
columns: object
|
||||
constructor(data: object, parserConfig = {}, progressCallback?: (msg: string) => void) {
|
||||
super(progressCallback)
|
||||
this.config = parserConfig
|
||||
this._jsonData = data
|
||||
this.project = {
|
||||
tables: [],
|
||||
}
|
||||
this.jsonData = []
|
||||
this.data = []
|
||||
this.columns = {}
|
||||
}
|
||||
|
||||
async init() {
|
||||
this.progress('Initializing json parser')
|
||||
const parsedJsonData =
|
||||
typeof this._jsonData === 'string'
|
||||
? // for json editor
|
||||
JSON.parse(this._jsonData)
|
||||
: // for file upload
|
||||
JSON.parse(new TextDecoder().decode(this._jsonData as BufferSource))
|
||||
this.jsonData = Array.isArray(parsedJsonData) ? parsedJsonData : [parsedJsonData]
|
||||
}
|
||||
|
||||
getColumns(): any {
|
||||
return this.columns
|
||||
}
|
||||
|
||||
getData(): any {
|
||||
return this.data
|
||||
}
|
||||
|
||||
parse(): any {
|
||||
this.progress('Parsing json data')
|
||||
const jsonData = this.jsonData
|
||||
const tn = 'table'
|
||||
const table: any = { table_name: tn, ref_table_name: tn, columns: [] }
|
||||
|
||||
this.data[tn] = []
|
||||
|
||||
for (const col of Object.keys(jsonData[0])) {
|
||||
const columns = this._parseColumn([col], jsonData)
|
||||
table.columns.push(...columns)
|
||||
}
|
||||
|
||||
if (this.config.shouldImportData) {
|
||||
this._parseTableData(table)
|
||||
}
|
||||
|
||||
this.project.tables.push(table)
|
||||
}
|
||||
|
||||
getTemplate() {
|
||||
return this.project
|
||||
}
|
||||
|
||||
_parseColumn(
|
||||
path: any = [],
|
||||
jsonData = this.jsonData,
|
||||
firstRowVal = path.reduce((val: any, k: any) => val && val[k], this.jsonData[0]),
|
||||
): any {
|
||||
const columns = []
|
||||
// parse nested
|
||||
if (firstRowVal && typeof firstRowVal === 'object' && !Array.isArray(firstRowVal) && this.config.normalizeNested) {
|
||||
for (const key of Object.keys(firstRowVal)) {
|
||||
const normalizedNestedColumns = this._parseColumn([...path, key], this.jsonData, firstRowVal[key])
|
||||
columns.push(...normalizedNestedColumns)
|
||||
}
|
||||
} else {
|
||||
const cn = path.join('_').replace(/\W/g, '_').trim()
|
||||
const column: Record<string, any> = {
|
||||
column_name: cn,
|
||||
ref_column_name: cn,
|
||||
uidt: UITypes.SingleLineText,
|
||||
path,
|
||||
}
|
||||
if (this.config.autoSelectFieldTypes) {
|
||||
column.uidt = jsonTypeToUidt[typeof firstRowVal] || UITypes.SingleLineText
|
||||
const colData = jsonData.map((r: any) => extractNestedData(r, path))
|
||||
Object.assign(column, getColumnUIDTAndMetas(colData, column.uidt))
|
||||
}
|
||||
columns.push(column)
|
||||
}
|
||||
|
||||
return columns
|
||||
}
|
||||
|
||||
_parseTableData(tableMeta: any) {
|
||||
for (const row of this.jsonData as any) {
|
||||
const rowData: any = {}
|
||||
for (let i = 0; i < tableMeta.columns.length; i++) {
|
||||
const value = extractNestedData(row, tableMeta.columns[i].path || [])
|
||||
if (tableMeta.columns[i].uidt === UITypes.Checkbox) {
|
||||
rowData[tableMeta.columns[i].ref_column_name] = getCheckboxValue(value)
|
||||
} else if (tableMeta.columns[i].uidt === UITypes.SingleSelect || tableMeta.columns[i].uidt === UITypes.MultiSelect) {
|
||||
rowData[tableMeta.columns[i].ref_column_name] = (value || '').toString().trim() || null
|
||||
} else if (tableMeta.columns[i].uidt === UITypes.JSON) {
|
||||
rowData[tableMeta.columns[i].ref_column_name] = JSON.stringify(value)
|
||||
} else {
|
||||
// toto: do parsing if necessary based on type
|
||||
rowData[tableMeta.columns[i].column_name] = value
|
||||
}
|
||||
}
|
||||
this.data[tableMeta.ref_table_name].push(rowData)
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user