Enhancement: Apply user's timezone to meta fields (alternative approach)

Signed-off-by: Kostiantyn Miakshyn <molodchick@gmail.com>

Author: Koc

lib/Db/Row2Mapper.php

@@ -13,7 +13,6 @@
 use OCA\Tables\Errors\InternalError;
 use OCA\Tables\Errors\NotFoundError;
 use OCA\Tables\Helper\ColumnsHelper;
-use OCA\Tables\Helper\TimezoneHelper;
 use OCA\Tables\Helper\UserHelper;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Db\MultipleObjectsReturnedException;
@@ -40,16 +39,7 @@ class Row2Mapper {
 
 	private ColumnsHelper $columnsHelper;
 
-	public function __construct(
-		?string $userId,
-		IDBConnection $db,
-		LoggerInterface $logger,
-		UserHelper $userHelper,
-		RowSleeveMapper $rowSleeveMapper,
-		ColumnsHelper $columnsHelper,
-		ColumnMapper $columnMapper,
-		private TimezoneHelper $timezoneHelper,
-	) {
+	public function __construct(?string $userId, IDBConnection $db, LoggerInterface $logger, UserHelper $userHelper, RowSleeveMapper $rowSleeveMapper, ColumnsHelper $columnsHelper, ColumnMapper $columnMapper) {
 		$this->rowSleeveMapper = $rowSleeveMapper;
 		$this->userId = $userId;
 		$this->db = $db;
@@ -641,9 +631,9 @@ private function parseEntities(IResult $result, array $sleeves): array {
 			$rows[$sleeve->getId()] = new Row2();
 			$rows[$sleeve->getId()]->setId($sleeve->getId());
 			$rows[$sleeve->getId()]->setCreatedBy($sleeve->getCreatedBy());
-			$rows[$sleeve->getId()]->setCreatedAt($this->timezoneHelper->applyUserTimezone($sleeve->getCreatedAt()));
+			$rows[$sleeve->getId()]->setCreatedAt($sleeve->getCreatedAt());
 			$rows[$sleeve->getId()]->setLastEditBy($sleeve->getLastEditBy());
-			$rows[$sleeve->getId()]->setLastEditAt($this->timezoneHelper->applyUserTimezone($sleeve->getLastEditAt()));
+			$rows[$sleeve->getId()]->setLastEditAt($sleeve->getLastEditAt());
 			$rows[$sleeve->getId()]->setTableId($sleeve->getTableId());
 		}
 

lib/Helper/TimezoneHelper.php

@@ -72,7 +72,9 @@ export default {
 	},
 	methods: {
 		relativeDateTime(v) {
-			return moment(v).format('L') === moment().format('L') ? t('tables', 'Today') + ' ' + moment(v).format('LT') : moment(v).format('LLLL')
+			const value = moment.utc(v).local()
+
+			return value.format('L') === moment().format('L') ? t('tables', 'Today') + ' ' + value.format('LT') : value.format('LLLL')
 		},
 	},
 }

src/modules/main/partials/ColumnInfoPopover.vue

@@ -19,7 +19,7 @@ export default class DatetimeColumn extends AbstractDatetimeColumn {
 	}
 
 	formatValue(value) {
-		return Moment(value, 'YYYY-MM-DD HH:mm:ss').format('lll')
+		return Moment.utc(value, 'YYYY-MM-DD HH:mm:ss').local().format('lll')
 	}
 
 	sort(mode, nextSorts) {

src/shared/components/ncTable/mixins/columnsTypes/datetime.js

@@ -15,7 +15,7 @@ export default class DatetimeDateColumn extends AbstractDatetimeColumn {
 	}
 
 	formatValue(value) {
-		return Moment(value, 'YYYY-MM-DD HH:mm:ss').format('ll')
+		return Moment.utc(value, 'YYYY-MM-DD HH:mm:ss').local().format('ll')
 	}
 
 	sort(mode, nextSorts) {

src/shared/components/ncTable/mixins/columnsTypes/datetimeDate.js

@@ -15,7 +15,7 @@ export default class DatetimeTimeColumn extends AbstractDatetimeColumn {
 	}
 
 	formatValue(value) {
-		return Moment(value, 'HH:mm:ss').format('LT')
+		return Moment.utc(value, 'HH:mm:ss').local().format('LT')
 	}
 
 	sort(mode, nextSorts) {

src/shared/components/ncTable/mixins/columnsTypes/datetimeTime.js

@@ -171,7 +171,7 @@ export default {
 				newValue = 'none'
 			} else {
 				const format = this.getDateFormat()
-				newValue = Moment(this.editDateTimeValue).format(format)
+				newValue = Moment(this.editDateTimeValue).utc().format(format)
 			}
 
 			if (newValue === this.value) {

src/shared/components/ncTable/partials/TableCellDateTime.vue

@@ -59,7 +59,7 @@ export default {
 				} else if (!v) {
 					this.$emit('update:value', this.isMandatoryField ? null : 'none')
 				} else {
-					this.$emit('update:value', Moment(v).format('YYYY-MM-DD HH:mm'))
+					this.$emit('update:value', Moment(v).utc().format('YYYY-MM-DD HH:mm'))
 				}
 			},
 		},

src/shared/components/ncTable/partials/rowTypePartials/DatetimeForm.vue

@@ -63,7 +63,7 @@ export default {
 				if (v === 'none') {
 					this.$emit('update:value', v)
 				} else if (v) {
-					this.$emit('update:value', Moment(v).format('HH:mm'))
+					this.$emit('update:value', Moment(v).utc().format('HH:mm'))
 				}
 			},
 		},

src/shared/components/ncTable/partials/rowTypePartials/DatetimeTimeForm.vue

@@ -15,7 +15,6 @@
 use OCA\Tables\Db\RowSleeveMapper;
 use OCA\Tables\Helper\CircleHelper;
 use OCA\Tables\Helper\ColumnsHelper;
-use OCA\Tables\Helper\TimezoneHelper;
 use OCA\Tables\Helper\UserHelper;
 use OCP\AppFramework\Db\DoesNotExistException;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -66,8 +65,7 @@ protected function setupDependencies(): void {
 			$this->userHelper,
 			$this->rowSleeveMapper,
 			$this->columnsHelper,
-			$this->columnMapper,
-			$this->createMock(TimezoneHelper::class)
+			$this->columnMapper
 		);
 
 		if (!self::$testDataInitialized) {