From 21cd0012b99da8d92e78f3607e45a2d803addb38 Mon Sep 17 00:00:00 2001 From: Pranav C Date: Thu, 4 Jan 2024 13:19:22 +0000 Subject: [PATCH] refactor: rename `CreateTime` to `CreatedTime` --- packages/nc-gui/components/smartsheet/Form.vue | 2 +- .../nc-gui/components/smartsheet/header/Menu.vue | 2 +- .../components/smartsheet/header/VirtualCellIcon.ts | 2 +- packages/nc-gui/components/template/Editor.vue | 2 +- packages/nc-gui/composables/useMultiSelect/index.ts | 2 +- packages/nc-gui/lang/ar.json | 4 ++-- packages/nc-gui/lang/bn_IN.json | 4 ++-- packages/nc-gui/lang/cs.json | 4 ++-- packages/nc-gui/lang/da.json | 4 ++-- packages/nc-gui/lang/de.json | 4 ++-- packages/nc-gui/lang/en.json | 4 ++-- packages/nc-gui/lang/es.json | 4 ++-- packages/nc-gui/lang/eu.json | 4 ++-- packages/nc-gui/lang/fa.json | 4 ++-- packages/nc-gui/lang/fi.json | 4 ++-- packages/nc-gui/lang/fr.json | 4 ++-- packages/nc-gui/lang/he.json | 4 ++-- packages/nc-gui/lang/hi.json | 4 ++-- packages/nc-gui/lang/hr.json | 4 ++-- packages/nc-gui/lang/id.json | 4 ++-- packages/nc-gui/lang/it.json | 4 ++-- packages/nc-gui/lang/ja.json | 4 ++-- packages/nc-gui/lang/ko.json | 4 ++-- packages/nc-gui/lang/lv.json | 4 ++-- packages/nc-gui/lang/nl.json | 4 ++-- packages/nc-gui/lang/no.json | 4 ++-- packages/nc-gui/lang/pl.json | 4 ++-- packages/nc-gui/lang/pt.json | 4 ++-- packages/nc-gui/lang/pt_BR.json | 4 ++-- packages/nc-gui/lang/ru.json | 4 ++-- packages/nc-gui/lang/sk.json | 4 ++-- packages/nc-gui/lang/sl.json | 4 ++-- packages/nc-gui/lang/sv.json | 4 ++-- packages/nc-gui/lang/th.json | 4 ++-- packages/nc-gui/lang/tr.json | 4 ++-- packages/nc-gui/lang/uk.json | 4 ++-- packages/nc-gui/lang/vi.json | 4 ++-- packages/nc-gui/lang/zh-Hans.json | 4 ++-- packages/nc-gui/lang/zh-Hant.json | 4 ++-- packages/nc-gui/utils/columnUtils.ts | 4 ++-- packages/nc-gui/utils/sortUtils.ts | 2 +- packages/nocodb-sdk/src/lib/UITypes.ts | 6 +++--- packages/nocodb-sdk/src/lib/formulaHelpers.ts | 2 +- packages/nocodb-sdk/src/lib/sqlUi/MssqlUi.ts | 8 ++++---- packages/nocodb-sdk/src/lib/sqlUi/MysqlUi.ts | 6 +++--- packages/nocodb-sdk/src/lib/sqlUi/OracleUi.ts | 4 ++-- packages/nocodb-sdk/src/lib/sqlUi/PgUi.ts | 8 ++++---- packages/nocodb-sdk/src/lib/sqlUi/SnowflakeUi.ts | 6 +++--- packages/nocodb-sdk/src/lib/sqlUi/SqliteUi.ts | 8 ++++---- packages/nocodb/src/db/BaseModelSqlv2.ts | 10 +++++----- packages/nocodb/src/db/conditionV2.ts | 8 ++++---- .../nocodb/src/db/formulav2/formulaQueryBuilderv2.ts | 2 +- packages/nocodb/src/helpers/columnHelpers.ts | 4 ++-- .../nocodb/src/helpers/getColumnPropsFromUIDT.ts | 2 +- packages/nocodb/src/helpers/populateSamplePayload.ts | 2 +- .../jobs/jobs/at-import/at-import.processor.ts | 4 ++-- .../jobs/jobs/export-import/import.service.ts | 4 ++-- packages/nocodb/src/schema/swagger-v2.json | 4 ++-- packages/nocodb/src/schema/swagger.json | 4 ++-- packages/nocodb/src/services/columns.service.ts | 12 ++++++------ .../ncXcdbCreatedAndUpdatedTimeUpgrader.ts | 4 ++-- 61 files changed, 130 insertions(+), 130 deletions(-) diff --git a/packages/nc-gui/components/smartsheet/Form.vue b/packages/nc-gui/components/smartsheet/Form.vue index a0749f1a92..3ae254f1cd 100644 --- a/packages/nc-gui/components/smartsheet/Form.vue +++ b/packages/nc-gui/components/smartsheet/Form.vue @@ -34,7 +34,7 @@ provide(IsGalleryInj, ref(false)) // todo: generate hideCols based on default values const hiddenCols = ['created_at', 'updated_at'] -const hiddenColTypes = [UITypes.Rollup, UITypes.Lookup, UITypes.Formula, UITypes.QrCode, UITypes.Barcode, UITypes.SpecificDBType, UITypes.CreateTime, UITypes.LastModifiedTime] +const hiddenColTypes = [UITypes.Rollup, UITypes.Lookup, UITypes.Formula, UITypes.QrCode, UITypes.Barcode, UITypes.SpecificDBType, UITypes.CreatedTime, UITypes.LastModifiedTime] const { isMobileMode, user } = useGlobal() diff --git a/packages/nc-gui/components/smartsheet/header/Menu.vue b/packages/nc-gui/components/smartsheet/header/Menu.vue index 062c4c0037..e002327536 100644 --- a/packages/nc-gui/components/smartsheet/header/Menu.vue +++ b/packages/nc-gui/components/smartsheet/header/Menu.vue @@ -280,7 +280,7 @@ const onInsertAfter = () => { const isDeleteAllowed = computed(() => { if (!column?.value) return false - if (column.value.uidt && [UITypes.CreateTime, UITypes.LastModifiedTime].includes(column.value.uidt) && column.value.system) { + if (column.value.uidt && [UITypes.CreatedTime, UITypes.LastModifiedTime].includes(column.value.uidt) && column.value.system) { return false } return true diff --git a/packages/nc-gui/components/smartsheet/header/VirtualCellIcon.ts b/packages/nc-gui/components/smartsheet/header/VirtualCellIcon.ts index cfa9f45d6b..1dfee0a8d5 100644 --- a/packages/nc-gui/components/smartsheet/header/VirtualCellIcon.ts +++ b/packages/nc-gui/components/smartsheet/header/VirtualCellIcon.ts @@ -62,7 +62,7 @@ const renderIcon = (column: ColumnType, relationColumn?: ColumnType) => { return { icon: iconMap.rollup, color: 'text-grey' } case UITypes.Count: return { icon: CountIcon, color: 'text-grey' } - case UITypes.CreateTime: + case UITypes.CreatedTime: case UITypes.LastModifiedTime: return { icon: iconMap.datetime, color: 'text-grey' } } diff --git a/packages/nc-gui/components/template/Editor.vue b/packages/nc-gui/components/template/Editor.vue index ded1508618..e01bdf6aeb 100644 --- a/packages/nc-gui/components/template/Editor.vue +++ b/packages/nc-gui/components/template/Editor.vue @@ -100,7 +100,7 @@ const uiTypeOptions = ref( .filter( (uiType) => !isVirtualCol(UITypes[uiType]) && - ![UITypes.ForeignKey, UITypes.ID, UITypes.CreateTime, UITypes.LastModifiedTime, UITypes.Barcode, UITypes.Button].includes( + ![UITypes.ForeignKey, UITypes.ID, UITypes.CreatedTime, UITypes.LastModifiedTime, UITypes.Barcode, UITypes.Button].includes( UITypes[uiType], ), ) diff --git a/packages/nc-gui/composables/useMultiSelect/index.ts b/packages/nc-gui/composables/useMultiSelect/index.ts index 65818478c4..2877e01922 100644 --- a/packages/nc-gui/composables/useMultiSelect/index.ts +++ b/packages/nc-gui/composables/useMultiSelect/index.ts @@ -136,7 +136,7 @@ export function useMultiSelect( }) } - if ([UITypes.DateTime, UITypes.CreateTime, UITypes.LastModifiedTime].includes(columnObj.uidt)) { + if ([UITypes.DateTime, UITypes.CreatedTime, UITypes.LastModifiedTime].includes(columnObj.uidt)) { // remove `"` // e.g. "2023-05-12T08:03:53.000Z" -> 2023-05-12T08:03:53.000Z textToCopy = textToCopy.replace(/["']/g, '') diff --git a/packages/nc-gui/lang/ar.json b/packages/nc-gui/lang/ar.json index e9831f6a8f..a9fdaf41eb 100644 --- a/packages/nc-gui/lang/ar.json +++ b/packages/nc-gui/lang/ar.json @@ -273,7 +273,7 @@ "Count": "العد", "Lookup": "مشاهدة بيانات", "DateTime": "تاريخ وقت", - "CreateTime": "إنشاء وقت", + "CreatedTime": "إنشاء وقت", "LastModifiedTime": "وقت آخر تعديل", "AutoNumber": "عدد تلقائي", "Barcode": "رمز", @@ -1347,4 +1347,4 @@ "roleUpdated": "Role updated successfully" } } -} \ No newline at end of file +} diff --git a/packages/nc-gui/lang/bn_IN.json b/packages/nc-gui/lang/bn_IN.json index e75d7334f6..2c86d819ae 100644 --- a/packages/nc-gui/lang/bn_IN.json +++ b/packages/nc-gui/lang/bn_IN.json @@ -273,7 +273,7 @@ "Count": "গণনা", "Lookup": "খুঁজে দেখো", "DateTime": "তারিখ সময়", - "CreateTime": "সময় তৈরি করুন", + "CreatedTime": "সময় তৈরি করুন", "LastModifiedTime": "শেষ পরিবর্তিত সময়", "AutoNumber": "অটো নম্বর", "Barcode": "বারকোড", @@ -1347,4 +1347,4 @@ "roleUpdated": "Role updated successfully" } } -} \ No newline at end of file +} diff --git a/packages/nc-gui/lang/cs.json b/packages/nc-gui/lang/cs.json index d4e09e6053..770414f29a 100644 --- a/packages/nc-gui/lang/cs.json +++ b/packages/nc-gui/lang/cs.json @@ -273,7 +273,7 @@ "Count": "Počet", "Lookup": "Vyhledávání", "DateTime": "Datum a čas", - "CreateTime": "Vytvořit čas", + "CreatedTime": "Vytvořit čas", "LastModifiedTime": "Čas poslední úpravy", "AutoNumber": "Automatické číslo", "Barcode": "Čárový kód", @@ -1347,4 +1347,4 @@ "roleUpdated": "Role byla úspěšně aktualizována" } } -} \ No newline at end of file +} diff --git a/packages/nc-gui/lang/da.json b/packages/nc-gui/lang/da.json index caf59b5604..18e8849abb 100644 --- a/packages/nc-gui/lang/da.json +++ b/packages/nc-gui/lang/da.json @@ -273,7 +273,7 @@ "Count": "Tælle", "Lookup": "Kig op", "DateTime": "Dato tid", - "CreateTime": "Opret tid", + "CreatedTime": "Opret tid", "LastModifiedTime": "Sidste ændret tid", "AutoNumber": "Auto nummer.", "Barcode": "Stregkode.", @@ -1347,4 +1347,4 @@ "roleUpdated": "Rolle opdateret med succes" } } -} \ No newline at end of file +} diff --git a/packages/nc-gui/lang/de.json b/packages/nc-gui/lang/de.json index af52bd09c3..dea56ccdbe 100644 --- a/packages/nc-gui/lang/de.json +++ b/packages/nc-gui/lang/de.json @@ -273,7 +273,7 @@ "Count": "Zählen", "Lookup": "Nachschlagen", "DateTime": "Datum/Zeit", - "CreateTime": "Zeit erstellen", + "CreatedTime": "Zeit erstellen", "LastModifiedTime": "Zuletzt bearbeitet", "AutoNumber": "Auto-Nummerierung", "Barcode": "Barcode", @@ -1347,4 +1347,4 @@ "roleUpdated": "Rolle erfolgreich aktualisiert" } } -} \ No newline at end of file +} diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json index bd37f1b56e..8f5276f96f 100644 --- a/packages/nc-gui/lang/en.json +++ b/packages/nc-gui/lang/en.json @@ -273,7 +273,7 @@ "Count": "Count", "Lookup": "Lookup", "DateTime": "Date Time", - "CreateTime": "Create Time", + "CreatedTime": "Create Time", "LastModifiedTime": "Last Modified Time", "AutoNumber": "Auto Number", "Barcode": "Barcode", @@ -1347,4 +1347,4 @@ "roleUpdated": "Role updated successfully" } } -} \ No newline at end of file +} diff --git a/packages/nc-gui/lang/es.json b/packages/nc-gui/lang/es.json index 25e1e79e52..bbe110d54b 100644 --- a/packages/nc-gui/lang/es.json +++ b/packages/nc-gui/lang/es.json @@ -273,7 +273,7 @@ "Count": "Cuenta", "Lookup": "Búsqueda", "DateTime": "Fecha y hora", - "CreateTime": "Fecha de creación", + "CreatedTime": "Fecha de creación", "LastModifiedTime": "Fecha de modificación", "AutoNumber": "Número automático", "Barcode": "Código de barras", @@ -1347,4 +1347,4 @@ "roleUpdated": "Función actualizada correctamente" } } -} \ No newline at end of file +} diff --git a/packages/nc-gui/lang/eu.json b/packages/nc-gui/lang/eu.json index c683c2fe78..d3b047be4e 100644 --- a/packages/nc-gui/lang/eu.json +++ b/packages/nc-gui/lang/eu.json @@ -273,7 +273,7 @@ "Count": "Count", "Lookup": "Lookup", "DateTime": "Date Time", - "CreateTime": "Create Time", + "CreatedTime": "Create Time", "LastModifiedTime": "Azkeneko aldatze ordua", "AutoNumber": "Auto Number", "Barcode": "Barcode", @@ -1347,4 +1347,4 @@ "roleUpdated": "Role updated successfully" } } -} \ No newline at end of file +} diff --git a/packages/nc-gui/lang/fa.json b/packages/nc-gui/lang/fa.json index b74b2fa716..1daae0b74e 100644 --- a/packages/nc-gui/lang/fa.json +++ b/packages/nc-gui/lang/fa.json @@ -273,7 +273,7 @@ "Count": "شمردن", "Lookup": "جست‌وجو", "DateTime": "تاریخ و زمان", - "CreateTime": "ایجاد زمان", + "CreatedTime": "ایجاد زمان", "LastModifiedTime": "زمان آخرین اصلاح", "AutoNumber": "شماره خودکار", "Barcode": "بارکد", @@ -1347,4 +1347,4 @@ "roleUpdated": "نقش با موفقیت به‌روزرسانی شد" } } -} \ No newline at end of file +} diff --git a/packages/nc-gui/lang/fi.json b/packages/nc-gui/lang/fi.json index a768d7f253..fbfad0f56a 100644 --- a/packages/nc-gui/lang/fi.json +++ b/packages/nc-gui/lang/fi.json @@ -273,7 +273,7 @@ "Count": "Kreivi", "Lookup": "Katso ylös", "DateTime": "Treffiaika", - "CreateTime": "Luoda aikaa", + "CreatedTime": "Luoda aikaa", "LastModifiedTime": "Viimeksi muutettu aika", "AutoNumber": "Automaattinen numero", "Barcode": "Viivakoodi", @@ -1347,4 +1347,4 @@ "roleUpdated": "Rooli päivitetty onnistuneesti" } } -} \ No newline at end of file +} diff --git a/packages/nc-gui/lang/fr.json b/packages/nc-gui/lang/fr.json index 4128ac37ba..33dbdaf6c0 100644 --- a/packages/nc-gui/lang/fr.json +++ b/packages/nc-gui/lang/fr.json @@ -273,7 +273,7 @@ "Count": "Compteur", "Lookup": "Consulter", "DateTime": "Date et heure", - "CreateTime": "Date de création", + "CreatedTime": "Date de création", "LastModifiedTime": "Dernière modification", "AutoNumber": "Numérotation automatique", "Barcode": "Code-barres", @@ -1347,4 +1347,4 @@ "roleUpdated": "Rôle mis à jour avec succès" } } -} \ No newline at end of file +} diff --git a/packages/nc-gui/lang/he.json b/packages/nc-gui/lang/he.json index 5e34b4dfd4..8454a37577 100644 --- a/packages/nc-gui/lang/he.json +++ b/packages/nc-gui/lang/he.json @@ -273,7 +273,7 @@ "Count": "ספירה", "Lookup": "הבט מעלה", "DateTime": "תאריך שעה", - "CreateTime": "צור זמן", + "CreatedTime": "צור זמן", "LastModifiedTime": "שונה לאחרונה", "AutoNumber": "מספר אוטומטי", "Barcode": "ברקוד", @@ -1347,4 +1347,4 @@ "roleUpdated": "תפקיד שונה בהצלחה" } } -} \ No newline at end of file +} diff --git a/packages/nc-gui/lang/hi.json b/packages/nc-gui/lang/hi.json index fe212f2d51..6991d01b2c 100644 --- a/packages/nc-gui/lang/hi.json +++ b/packages/nc-gui/lang/hi.json @@ -273,7 +273,7 @@ "Count": "गिनती करना", "Lookup": "देखो", "DateTime": "दिनांक और समय", - "CreateTime": "निर्माण का समय", + "CreatedTime": "निर्माण का समय", "LastModifiedTime": "अंतिम संशोधित समय", "AutoNumber": "वाहन नंबर", "Barcode": "बारकोड", @@ -1347,4 +1347,4 @@ "roleUpdated": "Role updated successfully" } } -} \ No newline at end of file +} diff --git a/packages/nc-gui/lang/hr.json b/packages/nc-gui/lang/hr.json index 40af983989..bdd246a21e 100644 --- a/packages/nc-gui/lang/hr.json +++ b/packages/nc-gui/lang/hr.json @@ -273,7 +273,7 @@ "Count": "Računati", "Lookup": "Pogledaj", "DateTime": "Datum vrijeme", - "CreateTime": "Stvoriti vrijeme", + "CreatedTime": "Stvoriti vrijeme", "LastModifiedTime": "Posljednje izmijenjeno vrijeme", "AutoNumber": "Automatski broj", "Barcode": "Barkod", @@ -1347,4 +1347,4 @@ "roleUpdated": "Uloga je uspješno aktualizirana" } } -} \ No newline at end of file +} diff --git a/packages/nc-gui/lang/id.json b/packages/nc-gui/lang/id.json index 0e9cfe26d8..cb1050a94e 100644 --- a/packages/nc-gui/lang/id.json +++ b/packages/nc-gui/lang/id.json @@ -273,7 +273,7 @@ "Count": "Menghitung", "Lookup": "Mencari", "DateTime": "Tanggal Waktu", - "CreateTime": "Buat waktu", + "CreatedTime": "Buat waktu", "LastModifiedTime": "Waktu yang dimodifikasi terakhir", "AutoNumber": "Nomor otomatis", "Barcode": "Barcode.", @@ -1347,4 +1347,4 @@ "roleUpdated": "Peran berhasil diperbarui" } } -} \ No newline at end of file +} diff --git a/packages/nc-gui/lang/it.json b/packages/nc-gui/lang/it.json index 5be1e41c78..bae7e6a0d1 100644 --- a/packages/nc-gui/lang/it.json +++ b/packages/nc-gui/lang/it.json @@ -273,7 +273,7 @@ "Count": "Contatore", "Lookup": "Consultazione", "DateTime": "Data e ora", - "CreateTime": "Data di creazione", + "CreatedTime": "Data di creazione", "LastModifiedTime": "Data di ultima modifica", "AutoNumber": "Numerazione automatica", "Barcode": "Codice a barre", @@ -1347,4 +1347,4 @@ "roleUpdated": "Ruolo aggiornato con successo" } } -} \ No newline at end of file +} diff --git a/packages/nc-gui/lang/ja.json b/packages/nc-gui/lang/ja.json index b5005a8975..031e62186c 100644 --- a/packages/nc-gui/lang/ja.json +++ b/packages/nc-gui/lang/ja.json @@ -273,7 +273,7 @@ "Count": "カウント", "Lookup": "ルックアップ", "DateTime": "DateTime型", - "CreateTime": "作成時刻", + "CreatedTime": "作成時刻", "LastModifiedTime": "最終更新日時", "AutoNumber": "自動採番", "Barcode": "バーコード", @@ -1347,4 +1347,4 @@ "roleUpdated": "ロールを更新しました" } } -} \ No newline at end of file +} diff --git a/packages/nc-gui/lang/ko.json b/packages/nc-gui/lang/ko.json index 325a21fe79..6014e51233 100644 --- a/packages/nc-gui/lang/ko.json +++ b/packages/nc-gui/lang/ko.json @@ -273,7 +273,7 @@ "Count": "카운트", "Lookup": "조회", "DateTime": "일시", - "CreateTime": "생성시간", + "CreatedTime": "생성시간", "LastModifiedTime": "최종수정시간", "AutoNumber": "자동번호", "Barcode": "바코드", @@ -1347,4 +1347,4 @@ "roleUpdated": "역할이 성공적으로 업데이트되었습니다." } } -} \ No newline at end of file +} diff --git a/packages/nc-gui/lang/lv.json b/packages/nc-gui/lang/lv.json index f4c9e18b10..615b02b340 100644 --- a/packages/nc-gui/lang/lv.json +++ b/packages/nc-gui/lang/lv.json @@ -273,7 +273,7 @@ "Count": "Skaits", "Lookup": "Uzmeklēšana", "DateTime": "Datums un laiks", - "CreateTime": "Izveidošanas laiks", + "CreatedTime": "Izveidošanas laiks", "LastModifiedTime": "Modificēšanas laiks", "AutoNumber": "Automātiska numerācija", "Barcode": "Svītru kods", @@ -1347,4 +1347,4 @@ "roleUpdated": "Loma veiksmīgi atjaunināta" } } -} \ No newline at end of file +} diff --git a/packages/nc-gui/lang/nl.json b/packages/nc-gui/lang/nl.json index 1af3718f64..478855b44d 100644 --- a/packages/nc-gui/lang/nl.json +++ b/packages/nc-gui/lang/nl.json @@ -273,7 +273,7 @@ "Count": "Telling", "Lookup": "Zoekopdracht", "DateTime": "Tijdstip", - "CreateTime": "Maak Tijd", + "CreatedTime": "Maak Tijd", "LastModifiedTime": "Laatst gewijzigd", "AutoNumber": "Automatische nummering", "Barcode": "Barcode", @@ -1347,4 +1347,4 @@ "roleUpdated": "Rol succesvol bijgewerkt" } } -} \ No newline at end of file +} diff --git a/packages/nc-gui/lang/no.json b/packages/nc-gui/lang/no.json index d8ee3a4137..0a9220c007 100644 --- a/packages/nc-gui/lang/no.json +++ b/packages/nc-gui/lang/no.json @@ -273,7 +273,7 @@ "Count": "Telle", "Lookup": "Se opp", "DateTime": "Dato tid", - "CreateTime": "Skape tid", + "CreatedTime": "Skape tid", "LastModifiedTime": "Sist endret tid", "AutoNumber": "Auto nummer", "Barcode": "Strekkode", @@ -1347,4 +1347,4 @@ "roleUpdated": "Role updated successfully" } } -} \ No newline at end of file +} diff --git a/packages/nc-gui/lang/pl.json b/packages/nc-gui/lang/pl.json index 21ce9bc50c..4491e081ce 100644 --- a/packages/nc-gui/lang/pl.json +++ b/packages/nc-gui/lang/pl.json @@ -273,7 +273,7 @@ "Count": "Licznik", "Lookup": "Wyszukiwanie", "DateTime": "Data i czas", - "CreateTime": "Data utworzenia", + "CreatedTime": "Data utworzenia", "LastModifiedTime": "Data ostatniej modyfikacji", "AutoNumber": "Automatyczny numer", "Barcode": "Kod kreskowy", @@ -1347,4 +1347,4 @@ "roleUpdated": "Rola została pomyślnie zaktualizowana" } } -} \ No newline at end of file +} diff --git a/packages/nc-gui/lang/pt.json b/packages/nc-gui/lang/pt.json index 19562e54ac..055c6b7771 100644 --- a/packages/nc-gui/lang/pt.json +++ b/packages/nc-gui/lang/pt.json @@ -273,7 +273,7 @@ "Count": "Contar", "Lookup": "Olho para cima", "DateTime": "Data hora", - "CreateTime": "Criar tempo", + "CreatedTime": "Criar tempo", "LastModifiedTime": "Última hora modificada", "AutoNumber": "Número automático", "Barcode": "Código de barras", @@ -1347,4 +1347,4 @@ "roleUpdated": "Papel actualizado com sucesso" } } -} \ No newline at end of file +} diff --git a/packages/nc-gui/lang/pt_BR.json b/packages/nc-gui/lang/pt_BR.json index 0618882aab..a87dfa6b93 100644 --- a/packages/nc-gui/lang/pt_BR.json +++ b/packages/nc-gui/lang/pt_BR.json @@ -273,7 +273,7 @@ "Count": "Quantidade", "Lookup": "Procurar", "DateTime": "Data e hora", - "CreateTime": "Hora da criação", + "CreatedTime": "Hora da criação", "LastModifiedTime": "Hora da última alteração", "AutoNumber": "Número automático", "Barcode": "Código de barras", @@ -1347,4 +1347,4 @@ "roleUpdated": "Papel actualizado com sucesso" } } -} \ No newline at end of file +} diff --git a/packages/nc-gui/lang/ru.json b/packages/nc-gui/lang/ru.json index a24f35fea2..7dbde74c87 100644 --- a/packages/nc-gui/lang/ru.json +++ b/packages/nc-gui/lang/ru.json @@ -273,7 +273,7 @@ "Count": "Количество", "Lookup": "Подстановка (Lookup)", "DateTime": "Дата и время", - "CreateTime": "Создан", + "CreatedTime": "Создан", "LastModifiedTime": "Изменен", "AutoNumber": "Счетчик", "Barcode": "Штрих-код", @@ -1347,4 +1347,4 @@ "roleUpdated": "Роль успешно обновлена" } } -} \ No newline at end of file +} diff --git a/packages/nc-gui/lang/sk.json b/packages/nc-gui/lang/sk.json index 78d28f40e8..ceafb27fa6 100644 --- a/packages/nc-gui/lang/sk.json +++ b/packages/nc-gui/lang/sk.json @@ -273,7 +273,7 @@ "Count": "Počítajte", "Lookup": "Vyhľadávanie", "DateTime": "Dátum Čas", - "CreateTime": "Vytvoriť čas", + "CreatedTime": "Vytvoriť čas", "LastModifiedTime": "Čas poslednej úpravy", "AutoNumber": "Automatické číslo", "Barcode": "Čiarový kód", @@ -1347,4 +1347,4 @@ "roleUpdated": "Úloha bola úspešne aktualizovaná" } } -} \ No newline at end of file +} diff --git a/packages/nc-gui/lang/sl.json b/packages/nc-gui/lang/sl.json index ede3864120..709747f464 100644 --- a/packages/nc-gui/lang/sl.json +++ b/packages/nc-gui/lang/sl.json @@ -273,7 +273,7 @@ "Count": "Count.", "Lookup": "Poglej gor", "DateTime": "Datum čas", - "CreateTime": "Ustvarite čas", + "CreatedTime": "Ustvarite čas", "LastModifiedTime": "Zadnji spremenjen čas", "AutoNumber": "Samodejna številka", "Barcode": "Črtna koda", @@ -1347,4 +1347,4 @@ "roleUpdated": "Vloga je bila uspešno posodobljena" } } -} \ No newline at end of file +} diff --git a/packages/nc-gui/lang/sv.json b/packages/nc-gui/lang/sv.json index 4ff19c74f1..eacc6bc7fd 100644 --- a/packages/nc-gui/lang/sv.json +++ b/packages/nc-gui/lang/sv.json @@ -273,7 +273,7 @@ "Count": "Räkna", "Lookup": "Slå upp", "DateTime": "Datum Tid", - "CreateTime": "Skapa tid", + "CreatedTime": "Skapa tid", "LastModifiedTime": "Senast ändrad tid", "AutoNumber": "Automatisk nummer", "Barcode": "Streckkod", @@ -1347,4 +1347,4 @@ "roleUpdated": "Rollen har uppdaterats framgångsrikt" } } -} \ No newline at end of file +} diff --git a/packages/nc-gui/lang/th.json b/packages/nc-gui/lang/th.json index 9a29273ec4..c7c36bb5ab 100644 --- a/packages/nc-gui/lang/th.json +++ b/packages/nc-gui/lang/th.json @@ -273,7 +273,7 @@ "Count": "นับ", "Lookup": "การค้นหา", "DateTime": "วันเวลา", - "CreateTime": "สร้างเวลา", + "CreatedTime": "สร้างเวลา", "LastModifiedTime": "เวลาที่แก้ไขล่าสุด", "AutoNumber": "หมายเลขอัตโนมัติ", "Barcode": "บาร์โค้ด", @@ -1347,4 +1347,4 @@ "roleUpdated": "Role updated successfully" } } -} \ No newline at end of file +} diff --git a/packages/nc-gui/lang/tr.json b/packages/nc-gui/lang/tr.json index 9a9640442e..fd352c74e3 100644 --- a/packages/nc-gui/lang/tr.json +++ b/packages/nc-gui/lang/tr.json @@ -273,7 +273,7 @@ "Count": "Say", "Lookup": "Referans", "DateTime": "Tarih saat", - "CreateTime": "Oluşturma zamanı", + "CreatedTime": "Oluşturma zamanı", "LastModifiedTime": "Son değiştirilme", "AutoNumber": "Otomatik Sayı", "Barcode": "Barkod", @@ -1347,4 +1347,4 @@ "roleUpdated": "Rol başarıyla güncellendi" } } -} \ No newline at end of file +} diff --git a/packages/nc-gui/lang/uk.json b/packages/nc-gui/lang/uk.json index af0a9dbd06..bf3cb8f448 100644 --- a/packages/nc-gui/lang/uk.json +++ b/packages/nc-gui/lang/uk.json @@ -273,7 +273,7 @@ "Count": "Кількість", "Lookup": "Пошук", "DateTime": "Дата і час", - "CreateTime": "Час створення", + "CreatedTime": "Час створення", "LastModifiedTime": "Час останньої зміни", "AutoNumber": "Автоматичне прирощування", "Barcode": "Штрих-код", @@ -1347,4 +1347,4 @@ "roleUpdated": "Роль успішно оновлено" } } -} \ No newline at end of file +} diff --git a/packages/nc-gui/lang/vi.json b/packages/nc-gui/lang/vi.json index 27acc9809a..9a26b3278d 100644 --- a/packages/nc-gui/lang/vi.json +++ b/packages/nc-gui/lang/vi.json @@ -273,7 +273,7 @@ "Count": "Đếm", "Lookup": "Tra cứu", "DateTime": "Ngày giờ", - "CreateTime": "Tạo thời gian", + "CreatedTime": "Tạo thời gian", "LastModifiedTime": "Thời gian sửa đổi lần cuối", "AutoNumber": "Số tự động", "Barcode": "Mã vạch.", @@ -1347,4 +1347,4 @@ "roleUpdated": "Role updated successfully" } } -} \ No newline at end of file +} diff --git a/packages/nc-gui/lang/zh-Hans.json b/packages/nc-gui/lang/zh-Hans.json index 8465d90021..02d78e85c8 100644 --- a/packages/nc-gui/lang/zh-Hans.json +++ b/packages/nc-gui/lang/zh-Hans.json @@ -273,7 +273,7 @@ "Count": "计数", "Lookup": "查找", "DateTime": "日期时间", - "CreateTime": "创建时间", + "CreatedTime": "创建时间", "LastModifiedTime": "最后修改时间", "AutoNumber": "自动编号", "Barcode": "条形码", @@ -1347,4 +1347,4 @@ "roleUpdated": "权限已更新" } } -} \ No newline at end of file +} diff --git a/packages/nc-gui/lang/zh-Hant.json b/packages/nc-gui/lang/zh-Hant.json index d9db6e4a95..23e17280fc 100644 --- a/packages/nc-gui/lang/zh-Hant.json +++ b/packages/nc-gui/lang/zh-Hant.json @@ -273,7 +273,7 @@ "Count": "計數", "Lookup": "查閱", "DateTime": "日期時間", - "CreateTime": "創建時間", + "CreatedTime": "創建時間", "LastModifiedTime": "最後修改時間", "AutoNumber": "自動編號", "Barcode": "條碼", @@ -1347,4 +1347,4 @@ "roleUpdated": "角色已成功更新" } } -} \ No newline at end of file +} diff --git a/packages/nc-gui/utils/columnUtils.ts b/packages/nc-gui/utils/columnUtils.ts index 0f42cb8762..4d21d5f7b0 100644 --- a/packages/nc-gui/utils/columnUtils.ts +++ b/packages/nc-gui/utils/columnUtils.ts @@ -139,7 +139,7 @@ const uiTypes = [ icon: iconMap.account, }, { - name: UITypes.CreateTime, + name: UITypes.CreatedTime, icon: iconMap.clock, }, { @@ -153,7 +153,7 @@ const getUIDTIcon = (uidt: UITypes | string) => { [ ...uiTypes, { - name: UITypes.CreateTime, + name: UITypes.CreatedTime, icon: iconMap.calendar, }, { diff --git a/packages/nc-gui/utils/sortUtils.ts b/packages/nc-gui/utils/sortUtils.ts index 7d2ccca8c6..b310e17938 100644 --- a/packages/nc-gui/utils/sortUtils.ts +++ b/packages/nc-gui/utils/sortUtils.ts @@ -15,7 +15,7 @@ export const getSortDirectionOptions = (uidt: UITypes | string) => { case UITypes.PhoneNumber: case UITypes.Date: case UITypes.DateTime: - case UITypes.CreateTime: + case UITypes.CreatedTime: case UITypes.LastModifiedTime: return [ { text: '1 → 9', value: 'asc' }, diff --git a/packages/nocodb-sdk/src/lib/UITypes.ts b/packages/nocodb-sdk/src/lib/UITypes.ts index 51b943dd1c..fd5e432377 100644 --- a/packages/nocodb-sdk/src/lib/UITypes.ts +++ b/packages/nocodb-sdk/src/lib/UITypes.ts @@ -29,7 +29,7 @@ enum UITypes { Rollup = 'Rollup', Count = 'Count', DateTime = 'DateTime', - CreateTime = 'CreateTime', + CreatedTime = 'CreatedTime', LastModifiedTime = 'LastModifiedTime', AutoNumber = 'AutoNumber', Geometry = 'Geometry', @@ -83,7 +83,7 @@ export function isVirtualCol( UITypes.Rollup, UITypes.Lookup, UITypes.Links, - UITypes.CreateTime, + UITypes.CreatedTime, UITypes.LastModifiedTime, // UITypes.Count, ].includes((typeof col === 'object' ? col?.uidt : col)); @@ -96,7 +96,7 @@ export function isCreatedTimeOrUpdatedTimeCol( | ColumnType ) { return [ - UITypes.CreateTime, + UITypes.CreatedTime, UITypes.LastModifiedTime, ].includes((typeof col === 'object' ? col?.uidt : col)); } diff --git a/packages/nocodb-sdk/src/lib/formulaHelpers.ts b/packages/nocodb-sdk/src/lib/formulaHelpers.ts index 3b472b47ef..1179976944 100644 --- a/packages/nocodb-sdk/src/lib/formulaHelpers.ts +++ b/packages/nocodb-sdk/src/lib/formulaHelpers.ts @@ -1528,7 +1528,7 @@ async function extractColumnIdentifierType({ // date case UITypes.Date: case UITypes.DateTime: - case UITypes.CreateTime: + case UITypes.CreatedTime: case UITypes.LastModifiedTime: res.dataType = FormulaDataTypes.DATE; break; diff --git a/packages/nocodb-sdk/src/lib/sqlUi/MssqlUi.ts b/packages/nocodb-sdk/src/lib/sqlUi/MssqlUi.ts index fd623f67be..c37d991bf6 100644 --- a/packages/nocodb-sdk/src/lib/sqlUi/MssqlUi.ts +++ b/packages/nocodb-sdk/src/lib/sqlUi/MssqlUi.ts @@ -107,7 +107,7 @@ export class MssqlUi { dtxp: '', dtxs: '', altered: 1, - uidt: UITypes.CreateTime, + uidt: UITypes.CreatedTime, uip: '', uicn: '', system: true, @@ -593,7 +593,7 @@ export class MssqlUi { case 'date': return 'Date'; case 'datetime': - return 'CreateTime'; + return 'CreatedTime'; case 'time': return 'Time'; case 'year': @@ -735,7 +735,7 @@ export class MssqlUi { case 'DateTime': colProp.dt = 'datetimeoffset'; break; - case 'CreateTime': + case 'CreatedTime': colProp.dt = 'datetime'; colProp.cdf = 'GETDATE()'; break; @@ -889,7 +889,7 @@ export class MssqlUi { return ['date']; case 'DateTime': - case 'CreateTime': + case 'CreatedTime': case 'LastModifiedTime': return [ 'datetimeoffset', diff --git a/packages/nocodb-sdk/src/lib/sqlUi/MysqlUi.ts b/packages/nocodb-sdk/src/lib/sqlUi/MysqlUi.ts index 9ab2fbe3b3..e256ae5fa2 100644 --- a/packages/nocodb-sdk/src/lib/sqlUi/MysqlUi.ts +++ b/packages/nocodb-sdk/src/lib/sqlUi/MysqlUi.ts @@ -111,7 +111,7 @@ export class MysqlUi { dtxp: '', dtxs: '', altered: 1, - uidt: UITypes.CreateTime, + uidt: UITypes.CreatedTime, uip: '', uicn: '', system: true, @@ -1073,7 +1073,7 @@ export class MysqlUi { case 'DateTime': colProp.dt = 'datetime'; break; - case 'CreateTime': + case 'CreatedTime': colProp.dt = 'timestamp'; colProp.cdf = 'CURRENT_TIMESTAMP'; break; @@ -1265,7 +1265,7 @@ export class MysqlUi { return ['date', 'datetime', 'timestamp', 'varchar']; case 'DateTime': - case 'CreateTime': + case 'CreatedTime': case 'LastModifiedTime': return ['datetime', 'timestamp', 'varchar']; diff --git a/packages/nocodb-sdk/src/lib/sqlUi/OracleUi.ts b/packages/nocodb-sdk/src/lib/sqlUi/OracleUi.ts index b32bc730f9..2c47a603f7 100644 --- a/packages/nocodb-sdk/src/lib/sqlUi/OracleUi.ts +++ b/packages/nocodb-sdk/src/lib/sqlUi/OracleUi.ts @@ -775,7 +775,7 @@ export class OracleUi { case 'date': return 'Date'; case 'datetime': - return 'CreateTime'; + return 'CreatedTime'; case 'time': return 'Time'; case 'year': @@ -915,7 +915,7 @@ export class OracleUi { case 'DateTime': colProp.dt = 'timestamp'; break; - case 'CreateTime': + case 'CreatedTime': colProp.dt = 'timestamp'; break; case 'LastModifiedTime': diff --git a/packages/nocodb-sdk/src/lib/sqlUi/PgUi.ts b/packages/nocodb-sdk/src/lib/sqlUi/PgUi.ts index 20f026ff3c..a2460599d8 100644 --- a/packages/nocodb-sdk/src/lib/sqlUi/PgUi.ts +++ b/packages/nocodb-sdk/src/lib/sqlUi/PgUi.ts @@ -170,7 +170,7 @@ export class PgUi { dtxp: '', dtxs: '', altered: 1, - uidt: UITypes.CreateTime, + uidt: UITypes.CreatedTime, uip: '', uicn: '', system: true, @@ -1551,7 +1551,7 @@ export class PgUi { case 'date': return 'Date'; case 'datetime': - return 'CreateTime'; + return 'CreatedTime'; case 'time': return 'Time'; case 'year': @@ -1687,7 +1687,7 @@ export class PgUi { case 'DateTime': colProp.dt = 'timestamp'; break; - case 'CreateTime': + case 'CreatedTime': colProp.dt = 'timestamp'; colProp.cdf = 'now()'; break; @@ -1937,7 +1937,7 @@ export class PgUi { ]; case 'DateTime': - case 'CreateTime': + case 'CreatedTime': case 'LastModifiedTime': return [ 'timestamp', diff --git a/packages/nocodb-sdk/src/lib/sqlUi/SnowflakeUi.ts b/packages/nocodb-sdk/src/lib/sqlUi/SnowflakeUi.ts index 48737ee8ba..ccdac2e4a8 100644 --- a/packages/nocodb-sdk/src/lib/sqlUi/SnowflakeUi.ts +++ b/packages/nocodb-sdk/src/lib/sqlUi/SnowflakeUi.ts @@ -106,7 +106,7 @@ export class SnowflakeUi { dtxp: '', dtxs: '', altered: 1, - uidt: UITypes.CreateTime, + uidt: UITypes.CreatedTime, uip: '', uicn: '', system: true, @@ -778,7 +778,7 @@ export class SnowflakeUi { case 'DateTime': colProp.dt = 'TIMESTAMP'; break; - case 'CreateTime': + case 'CreatedTime': colProp.dt = 'TIMESTAMP'; colProp.cdf = 'current_timestamp()'; break; @@ -956,7 +956,7 @@ export class SnowflakeUi { return ['DATE', 'TIMESTAMP']; case 'DateTime': - case 'CreateTime': + case 'CreatedTime': case 'LastModifiedTime': return ['TIMESTAMP']; diff --git a/packages/nocodb-sdk/src/lib/sqlUi/SqliteUi.ts b/packages/nocodb-sdk/src/lib/sqlUi/SqliteUi.ts index 4869dd2bb9..a74537d4d6 100644 --- a/packages/nocodb-sdk/src/lib/sqlUi/SqliteUi.ts +++ b/packages/nocodb-sdk/src/lib/sqlUi/SqliteUi.ts @@ -94,7 +94,7 @@ export class SqliteUi { dtxp: '', dtxs: '', altered: 1, - uidt: UITypes.CreateTime, + uidt: UITypes.CreatedTime, uip: '', uicn: '', system: true, @@ -492,7 +492,7 @@ export class SqliteUi { case 'date': return 'Date'; case 'datetime': - return 'CreateTime'; + return 'CreatedTime'; case 'time': return 'Time'; case 'year': @@ -628,7 +628,7 @@ export class SqliteUi { case 'DateTime': colProp.dt = 'datetime'; break; - case 'CreateTime': + case 'CreatedTime': colProp.dt = 'datetime'; colProp.cdf = 'CURRENT_TIMESTAMP'; break; @@ -841,7 +841,7 @@ export class SqliteUi { return ['date', 'varchar']; case 'DateTime': - case 'CreateTime': + case 'CreatedTime': case 'LastModifiedTime': return ['datetime', 'timestamp']; diff --git a/packages/nocodb/src/db/BaseModelSqlv2.ts b/packages/nocodb/src/db/BaseModelSqlv2.ts index 3abdca693d..f05afa77e9 100644 --- a/packages/nocodb/src/db/BaseModelSqlv2.ts +++ b/packages/nocodb/src/db/BaseModelSqlv2.ts @@ -103,9 +103,9 @@ function checkColumnRequired( export function getColumnName(column: Column, columns: Column[] = []) { switch (column.uidt) { - case UITypes.CreateTime: { + case UITypes.CreatedTime: { const createdTimeSystemCol = columns.find( - (col) => col.system && col.uidt === UITypes.CreateTime, + (col) => col.system && col.uidt === UITypes.CreatedTime, ); if (createdTimeSystemCol) return createdTimeSystemCol.column_name; return column.column_name || 'created_at'; @@ -2135,7 +2135,7 @@ class BaseModelSqlv2 { if (!checkColumnRequired(column, fields, extractPkAndPv)) continue; switch (column.uidt) { - case UITypes.CreateTime: + case UITypes.CreatedTime: case UITypes.LastModifiedTime: case UITypes.DateTime: { @@ -5639,7 +5639,7 @@ class BaseModelSqlv2 { [ UITypes.Attachment, UITypes.User, - UITypes.CreateTime, + UITypes.CreatedTime, UITypes.LastModifiedTime, ].includes(c.uidt), ) @@ -5647,7 +5647,7 @@ class BaseModelSqlv2 { for (const column of this.model.columns) { if ( isInsertData && - column.uidt === UITypes.CreateTime && + column.uidt === UITypes.CreatedTime && column.system ) { data[column.column_name] = Noco.ncMeta.now(); diff --git a/packages/nocodb/src/db/conditionV2.ts b/packages/nocodb/src/db/conditionV2.ts index 132d3fe602..cff5517ba6 100644 --- a/packages/nocodb/src/db/conditionV2.ts +++ b/packages/nocodb/src/db/conditionV2.ts @@ -556,7 +556,7 @@ const parseConditionV2 = async ( [ UITypes.Date, UITypes.DateTime, - UITypes.CreateTime, + UITypes.CreatedTime, UITypes.LastModifiedTime, ].includes(column.uidt) ) { @@ -673,7 +673,7 @@ const parseConditionV2 = async ( if ( [ UITypes.DateTime, - UITypes.CreateTime, + UITypes.CreatedTime, UITypes.LastModifiedTime, ].includes(column.uidt) ) { @@ -962,7 +962,7 @@ const parseConditionV2 = async ( !isNumericCol(column.uidt) && ![ UITypes.Date, - UITypes.CreateTime, + UITypes.CreatedTime, UITypes.LastModifiedTime, UITypes.DateTime, UITypes.Time, @@ -985,7 +985,7 @@ const parseConditionV2 = async ( ![ UITypes.Date, UITypes.DateTime, - UITypes.CreateTime, + UITypes.CreatedTime, UITypes.LastModifiedTime, UITypes.Time, ].includes(column.uidt) diff --git a/packages/nocodb/src/db/formulav2/formulaQueryBuilderv2.ts b/packages/nocodb/src/db/formulav2/formulaQueryBuilderv2.ts index 745e6633c3..7c079e2631 100644 --- a/packages/nocodb/src/db/formulav2/formulaQueryBuilderv2.ts +++ b/packages/nocodb/src/db/formulav2/formulaQueryBuilderv2.ts @@ -638,7 +638,7 @@ async function _formulaQueryBuilder( }; }; break; - case UITypes.CreateTime: + case UITypes.CreatedTime: case UITypes.LastModifiedTime: case UITypes.DateTime: { diff --git a/packages/nocodb/src/helpers/columnHelpers.ts b/packages/nocodb/src/helpers/columnHelpers.ts index 3310c28ccd..d2c9ab06f2 100644 --- a/packages/nocodb/src/helpers/columnHelpers.ts +++ b/packages/nocodb/src/helpers/columnHelpers.ts @@ -289,13 +289,13 @@ export const sanitizeColumnName = (name: string) => { }; // if column is an alias column then return the original column -// for example CreatedTime is an alias column for CreateTime system column +// for example CreatedTime is an alias column for CreatedTime system column export const getRefColumnIfAlias = async ( column: Column, columns?: Column[], ) => { if ( - !([UITypes.CreateTime, UITypes.LastModifiedTime] as UITypes[]).includes( + !([UITypes.CreatedTime, UITypes.LastModifiedTime] as UITypes[]).includes( column.uidt, ) ) diff --git a/packages/nocodb/src/helpers/getColumnPropsFromUIDT.ts b/packages/nocodb/src/helpers/getColumnPropsFromUIDT.ts index 3210762fae..5a3568e0a4 100644 --- a/packages/nocodb/src/helpers/getColumnPropsFromUIDT.ts +++ b/packages/nocodb/src/helpers/getColumnPropsFromUIDT.ts @@ -39,7 +39,7 @@ export default async function getColumnPropsFromUIDT( const finalColumnMeta = { ...newColumn, ...column }; - if (finalColumnMeta.uidt === UITypes.CreateTime) { + if (finalColumnMeta.uidt === UITypes.CreatedTime) { finalColumnMeta.column_name = 'created_at'; } else if (finalColumnMeta.uidt === UITypes.LastModifiedTime) { finalColumnMeta.column_name = 'updated_at'; diff --git a/packages/nocodb/src/helpers/populateSamplePayload.ts b/packages/nocodb/src/helpers/populateSamplePayload.ts index 4fc0bfaa85..b2875cbeee 100644 --- a/packages/nocodb/src/helpers/populateSamplePayload.ts +++ b/packages/nocodb/src/helpers/populateSamplePayload.ts @@ -270,7 +270,7 @@ async function getSampleColumnValue(column: Column): Promise { return new Date(); } break; - case UITypes.CreateTime: + case UITypes.CreatedTime: { return new Date(); } diff --git a/packages/nocodb/src/modules/jobs/jobs/at-import/at-import.processor.ts b/packages/nocodb/src/modules/jobs/jobs/at-import/at-import.processor.ts index 7517aa0e2c..17a73b81f6 100644 --- a/packages/nocodb/src/modules/jobs/jobs/at-import/at-import.processor.ts +++ b/packages/nocodb/src/modules/jobs/jobs/at-import/at-import.processor.ts @@ -364,7 +364,7 @@ export class AtImportProcessor { // types email & url are marked as text // types currency & percent, duration are marked as number - // types createTime & modifiedTime are marked as formula + // types CreatedTime & modifiedTime are marked as formula switch (col.type) { case 'text': @@ -1437,7 +1437,7 @@ export class AtImportProcessor { break; case UITypes.DateTime: - case UITypes.CreateTime: + case UITypes.CreatedTime: case UITypes.LastModifiedTime: rec[key] = dayjs(value).format('YYYY-MM-DD HH:mm'); break; diff --git a/packages/nocodb/src/modules/jobs/jobs/export-import/import.service.ts b/packages/nocodb/src/modules/jobs/jobs/export-import/import.service.ts index 4f9b49fa56..e993c6080d 100644 --- a/packages/nocodb/src/modules/jobs/jobs/export-import/import.service.ts +++ b/packages/nocodb/src/modules/jobs/jobs/export-import/import.service.ts @@ -766,7 +766,7 @@ export class ImportService { a.uidt === UITypes.Rollup || a.uidt === UITypes.Formula || a.uidt === UITypes.QrCode || - a.uidt === UITypes.CreateTime || + a.uidt === UITypes.CreatedTime || a.uidt === UITypes.LastModifiedTime || a.uidt === UITypes.Barcode, ), @@ -895,7 +895,7 @@ export class ImportService { } } } else if ( - col.uidt === UITypes.CreateTime || + col.uidt === UITypes.CreatedTime || col.uidt === UITypes.LastModifiedTime ) { const freshModelData = await this.columnsService.columnAdd({ diff --git a/packages/nocodb/src/schema/swagger-v2.json b/packages/nocodb/src/schema/swagger-v2.json index 7467bf61ae..f106b7debe 100644 --- a/packages/nocodb/src/schema/swagger-v2.json +++ b/packages/nocodb/src/schema/swagger-v2.json @@ -12096,7 +12096,7 @@ "Checkbox", "Collaborator", "Count", - "CreateTime", + "CreatedTime", "Currency", "Date", "DateTime", @@ -15314,7 +15314,7 @@ "Checkbox", "Collaborator", "Count", - "CreateTime", + "CreatedTime", "Currency", "Date", "DateTime", diff --git a/packages/nocodb/src/schema/swagger.json b/packages/nocodb/src/schema/swagger.json index a2fde486d3..cee26a1fd6 100644 --- a/packages/nocodb/src/schema/swagger.json +++ b/packages/nocodb/src/schema/swagger.json @@ -17313,7 +17313,7 @@ "Checkbox", "Collaborator", "Count", - "CreateTime", + "CreatedTime", "Currency", "Date", "DateTime", @@ -20534,7 +20534,7 @@ "Checkbox", "Collaborator", "Count", - "CreateTime", + "CreatedTime", "Currency", "Date", "DateTime", diff --git a/packages/nocodb/src/services/columns.service.ts b/packages/nocodb/src/services/columns.service.ts index 0c7f203cdd..5573bbb072 100644 --- a/packages/nocodb/src/services/columns.service.ts +++ b/packages/nocodb/src/services/columns.service.ts @@ -296,7 +296,7 @@ export class ColumnsService { `Updating ${colBody.uidt} => ${colBody.uidt} is not implemented`, ); } else if ( - [UITypes.CreateTime, UITypes.LastModifiedTime].includes(colBody.uidt) + [UITypes.CreatedTime, UITypes.LastModifiedTime].includes(colBody.uidt) ) { // allow updating of title only await Column.update(param.columnId, { @@ -1685,7 +1685,7 @@ export class ColumnsService { }); break; - case UITypes.CreateTime: + case UITypes.CreatedTime: case UITypes.LastModifiedTime: { let columnName: string; @@ -1696,12 +1696,12 @@ export class ColumnsService { (c) => c.uidt === colBody.uidt && c.system, // || // c.column_name === - // (c.uidt === UITypes.CreateTime ? 'created_at' : 'updated_at'), + // (c.uidt === UITypes.CreatedTime ? 'created_at' : 'updated_at'), ); if (!existingColumn) { columnName = - colBody.uidt === UITypes.CreateTime ? 'created_at' : 'updated_at'; + colBody.uidt === UITypes.CreatedTime ? 'created_at' : 'updated_at'; // const sqlClient = await reuseOrSave('sqlClient', reuse, async () => // NcConnectionMgrv2.getSqlClient(source), // ); @@ -1751,7 +1751,7 @@ export class ColumnsService { const title = getUniqueColumnAliasName( table.columns, - UITypes.CreateTime ? 'CreatedAt' : 'UpdatedAt', + UITypes.CreatedTime ? 'CreatedAt' : 'UpdatedAt', ); await Column.insert({ @@ -2209,7 +2209,7 @@ export class ColumnsService { } // on delete create time or last modified time, keep the column in table and delete the column from meta - case UITypes.CreateTime: + case UITypes.CreatedTime: case UITypes.LastModifiedTime: { if (column.system) { diff --git a/packages/nocodb/src/version-upgrader/ncXcdbCreatedAndUpdatedTimeUpgrader.ts b/packages/nocodb/src/version-upgrader/ncXcdbCreatedAndUpdatedTimeUpgrader.ts index 912554418b..931cd7ea5a 100644 --- a/packages/nocodb/src/version-upgrader/ncXcdbCreatedAndUpdatedTimeUpgrader.ts +++ b/packages/nocodb/src/version-upgrader/ncXcdbCreatedAndUpdatedTimeUpgrader.ts @@ -6,7 +6,7 @@ import { MetaTable } from '~/utils/globals'; import { Column, Model } from '~/models'; // An upgrader for upgrading created_at and updated_at columns -// to system column and convert to new uidt CreateTime and LastModifiedTime +// to system column and convert to new uidt CreatedTime and LastModifiedTime const logger = new Logger('XcdbCreatedAndUpdatedTimeUpgrader'); @@ -31,7 +31,7 @@ async function upgradeModels({ for (const column of columns) { if (column.column_name === 'created_at') { await Column.update(column.id, { - uidt: UITypes.CreateTime, + uidt: UITypes.CreatedTime, system: true, }); }