From 906780d9eaf55ca36bb2915b1522e2f07cdd70dc Mon Sep 17 00:00:00 2001 From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com> Date: Tue, 3 Sep 2024 06:11:14 +0000 Subject: [PATCH 1/2] fix(nc-gui): show 1y ago if days diff is greater than 360 --- packages/nc-gui/utils/datetimeUtils.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/nc-gui/utils/datetimeUtils.ts b/packages/nc-gui/utils/datetimeUtils.ts index 2924b723ff..46ae5ec375 100644 --- a/packages/nc-gui/utils/datetimeUtils.ts +++ b/packages/nc-gui/utils/datetimeUtils.ts @@ -49,5 +49,9 @@ export const timeAgo = (date: string) => { if (months < 12) { return `${months}mo ago` } + if (years < 1) { + return `1y ago` + } + return `${years}y ago` } From 0974d29241681fe20c60c1884868c627e1cecc87 Mon Sep 17 00:00:00 2001 From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com> Date: Tue, 3 Sep 2024 06:11:14 +0000 Subject: [PATCH 2/2] fix(nc-gui): add created_at info in response for role editor & below --- packages/nocodb/src/models/BaseUser.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/nocodb/src/models/BaseUser.ts b/packages/nocodb/src/models/BaseUser.ts index 61fce6220d..dda2417d0b 100644 --- a/packages/nocodb/src/models/BaseUser.ts +++ b/packages/nocodb/src/models/BaseUser.ts @@ -181,7 +181,7 @@ export default class BaseUser { let { list: baseUsers } = cachedList; const { isNoneList } = cachedList; - const fullVersionCols = ['invite_token', 'created_at']; + const fullVersionCols = ['invite_token']; if (!isNoneList && !baseUsers.length) { const queryBuilder = ncMeta