feat: date-formatting

api-gateway/src/routes/authentication.routes.ts

@@ -56,7 +56,7 @@ authenticationRouter.route("/2FA/Code/Login").post(async (req, res) => {
       return res
         .status(200)
         .cookie("mb_refresh_token", response.data.refreshToken, {
-          sameSite: "none",
+          sameSite: process.env.NODE_ENV === "production" ? "none" : "lax",
           secure: process.env.NODE_ENV === "production",
           httpOnly: true,
           expires: new Date(Date.now() + 18 * 60 * 60 * 1000),
@@ -114,10 +114,10 @@ authenticationRouter.route("/Login/Refresh").get(async (req, res) => {
 authenticationRouter.route("/Logout").get(async (_, res) => {
   return res
     .cookie("mb_refresh_token", "expiring now", {
-      expires: new Date(Date.now()),
-      sameSite: "none",
+      sameSite: process.env.NODE_ENV === "production" ? "none" : "lax",
       secure: process.env.NODE_ENV === "production",
       httpOnly: true,
+      expires: new Date(Date.now()),
     })
     .json({ success: true });
 });

application-data-service/src/db/entities/Task.ts

@@ -1,4 +1,12 @@
-import { Entity, PrimaryGeneratedColumn, Column, BaseEntity } from "typeorm";
+import {
+  Entity,
+  PrimaryGeneratedColumn,
+  Column,
+  BaseEntity,
+  CreateDateColumn,
+  UpdateDateColumn,
+  VersionColumn,
+} from "typeorm";
 
 @Entity("tasks")
 export default class Task extends BaseEntity {
@@ -29,9 +37,12 @@ export default class Task extends BaseEntity {
   @Column("text", { name: "client_id" })
   clientId: string;
 
-  @Column({ type: "timestamp", default: () => "CURRENT_TIMESTAMP", name: "created_at" })
+  @CreateDateColumn({ name: "created_at" })
   createdAt: Date;
 
-  @Column({ type: "timestamp", default: () => "CURRENT_TIMESTAMP", onUpdate: "CURRENT_TIMESTAMP", name: "updated_at" })
+  @UpdateDateColumn({ name: "updated_at" })
   updatedAt: Date;
+
+  @VersionColumn({ default: 1 })
+  version: number;
 }

application-data-service/src/db/entities/TaskShareMappings.ts

@@ -1,4 +1,4 @@
-import { Entity, PrimaryGeneratedColumn, Column, BaseEntity } from "typeorm";
+import { Entity, PrimaryGeneratedColumn, Column, BaseEntity, CreateDateColumn, UpdateDateColumn } from "typeorm";
 
 @Entity("task_share_mappings")
 export default class TaskShareMapping extends BaseEntity {
@@ -14,9 +14,9 @@ export default class TaskShareMapping extends BaseEntity {
   @Column("bool", { name: "is_active", default: true })
   isActive: boolean;
 
-  @Column({ type: "timestamp", default: () => "CURRENT_TIMESTAMP", name: "created_at" })
+  @CreateDateColumn({ name: "created_at" })
   createdAt: Date;
 
-  @Column({ type: "timestamp", default: () => "CURRENT_TIMESTAMP", onUpdate: "CURRENT_TIMESTAMP", name: "updated_at" })
+  @UpdateDateColumn({ name: "updated_at" })
   updatedAt: Date;
 }

auth-service/src/db/entities/Client.ts

@@ -1,4 +1,12 @@
-import { Entity, PrimaryGeneratedColumn, Column, BaseEntity } from "typeorm";
+import {
+  Entity,
+  PrimaryGeneratedColumn,
+  Column,
+  BaseEntity,
+  CreateDateColumn,
+  UpdateDateColumn,
+  VersionColumn,
+} from "typeorm";
 
 @Entity("clients")
 export default class Client extends BaseEntity {
@@ -14,9 +22,12 @@ export default class Client extends BaseEntity {
   @Column("bool", { name: "is_active", default: true })
   isActive: boolean;
 
-  @Column({ type: "timestamp", default: () => "CURRENT_TIMESTAMP", name: "created_at" })
+  @CreateDateColumn({ name: "created_at" })
   createdAt: Date;
 
-  @Column({ type: "timestamp", default: () => "CURRENT_TIMESTAMP", onUpdate: "CURRENT_TIMESTAMP", name: "updated_at" })
+  @UpdateDateColumn({ name: "updated_at" })
   updatedAt: Date;
+
+  @VersionColumn({ default: 1 })
+  version: number;
 }

auth-service/src/db/entities/EmailConfirmations.ts

@@ -1,4 +1,4 @@
-import { Entity, PrimaryGeneratedColumn, Column, BaseEntity } from "typeorm";
+import { Entity, PrimaryGeneratedColumn, Column, BaseEntity, CreateDateColumn, UpdateDateColumn } from "typeorm";
 
 type ConfirmationType = "account_confirmation" | "password_reset" | "lost_2fa_access";
 
@@ -19,9 +19,9 @@ export default class EmailConfirmations extends BaseEntity {
   @Column({ type: "timestamp", default: () => "NOW() + INTERVAL '90 day'", name: "expires_at" })
   expiresAt: Date;
 
-  @Column({ type: "timestamp", default: () => "CURRENT_TIMESTAMP", name: "created_at" })
+  @CreateDateColumn({ name: "created_at" })
   createdAt: Date;
 
-  @Column({ type: "timestamp", default: () => "CURRENT_TIMESTAMP", onUpdate: "CURRENT_TIMESTAMP", name: "updated_at" })
+  @UpdateDateColumn({ name: "updated_at" })
   updatedAt: Date;
 }

auth-service/src/db/entities/Role.ts

@@ -1,4 +1,12 @@
-import { Entity, PrimaryGeneratedColumn, Column, BaseEntity } from "typeorm";
+import {
+  Entity,
+  PrimaryGeneratedColumn,
+  Column,
+  BaseEntity,
+  CreateDateColumn,
+  UpdateDateColumn,
+  VersionColumn,
+} from "typeorm";
 
 @Entity("roles")
 export default class Role extends BaseEntity {
@@ -23,9 +31,12 @@ export default class Role extends BaseEntity {
   @Column("bool", { name: "is_user_deletable", default: true })
   isUserDeletable: boolean;
 
-  @Column({ type: "timestamp", default: () => "CURRENT_TIMESTAMP", name: "created_at" })
+  @CreateDateColumn({ name: "created_at" })
   createdAt: Date;
 
-  @Column({ type: "timestamp", default: () => "CURRENT_TIMESTAMP", onUpdate: "CURRENT_TIMESTAMP", name: "updated_at" })
+  @UpdateDateColumn({ name: "updated_at" })
   updatedAt: Date;
+
+  @VersionColumn({ default: 1 })
+  version: number;
 }

auth-service/src/db/entities/RoleMapping.ts

@@ -1,4 +1,4 @@
-import { Entity, PrimaryGeneratedColumn, Column, BaseEntity } from "typeorm";
+import { Entity, PrimaryGeneratedColumn, Column, BaseEntity, CreateDateColumn, UpdateDateColumn } from "typeorm";
 
 @Entity("role_mappings")
 export default class RoleMapping extends BaseEntity {
@@ -11,9 +11,9 @@ export default class RoleMapping extends BaseEntity {
   @Column("text", { name: "user_id" })
   userId: string;
 
-  @Column({ type: "timestamp", default: () => "CURRENT_TIMESTAMP", name: "created_at" })
+  @CreateDateColumn({ name: "created_at" })
   createdAt: Date;
 
-  @Column({ type: "timestamp", default: () => "CURRENT_TIMESTAMP", onUpdate: "CURRENT_TIMESTAMP", name: "updated_at" })
+  @UpdateDateColumn({ name: "updated_at" })
   updatedAt: Date;
 }

auth-service/src/db/entities/Team.ts

@@ -1,4 +1,12 @@
-import { Entity, PrimaryGeneratedColumn, Column, BaseEntity } from "typeorm";
+import {
+  Entity,
+  PrimaryGeneratedColumn,
+  Column,
+  BaseEntity,
+  CreateDateColumn,
+  UpdateDateColumn,
+  VersionColumn,
+} from "typeorm";
 
 @Entity("teams")
 export default class Team extends BaseEntity {
@@ -20,9 +28,12 @@ export default class Team extends BaseEntity {
   @Column("bool", { name: "is_user_deletable", default: true })
   isUserDeletable: boolean;
 
-  @Column({ type: "timestamp", default: () => "CURRENT_TIMESTAMP", name: "created_at" })
+  @CreateDateColumn({ name: "created_at" })
   createdAt: Date;
 
-  @Column({ type: "timestamp", default: () => "CURRENT_TIMESTAMP", onUpdate: "CURRENT_TIMESTAMP", name: "updated_at" })
+  @UpdateDateColumn({ name: "updated_at" })
   updatedAt: Date;
+
+  @VersionColumn({ default: 1 })
+  version: number;
 }

auth-service/src/db/entities/TeamMapping.ts

@@ -1,4 +1,4 @@
-import { Entity, PrimaryGeneratedColumn, Column, BaseEntity } from "typeorm";
+import { Entity, PrimaryGeneratedColumn, Column, BaseEntity, CreateDateColumn, UpdateDateColumn } from "typeorm";
 
 @Entity("team_mappings")
 export default class TeamMapping extends BaseEntity {
@@ -11,9 +11,9 @@ export default class TeamMapping extends BaseEntity {
   @Column("text", { name: "user_id" })
   userId: string;
 
-  @Column({ type: "timestamp", default: () => "CURRENT_TIMESTAMP", name: "created_at" })
+  @CreateDateColumn({ name: "created_at" })
   createdAt: Date;
 
-  @Column({ type: "timestamp", default: () => "CURRENT_TIMESTAMP", onUpdate: "CURRENT_TIMESTAMP", name: "updated_at" })
+  @UpdateDateColumn({ name: "updated_at" })
   updatedAt: Date;
 }

auth-service/src/db/entities/TwoFactorAuthMapping.ts

@@ -1,4 +1,4 @@
-import { Entity, PrimaryGeneratedColumn, Column, BaseEntity } from "typeorm";
+import { Entity, PrimaryGeneratedColumn, Column, BaseEntity, CreateDateColumn, UpdateDateColumn } from "typeorm";
 
 @Entity("two_factor_auth_mappings")
 export default class TwoFactorAuthMapping extends BaseEntity {
@@ -14,9 +14,9 @@ export default class TwoFactorAuthMapping extends BaseEntity {
   @Column("text", { name: "is_temp", default: true })
   is_temp: boolean;
 
-  @Column({ type: "timestamp", default: () => "CURRENT_TIMESTAMP", name: "created_at" })
+  @CreateDateColumn({ name: "created_at" })
   createdAt: Date;
 
-  @Column({ type: "timestamp", default: () => "CURRENT_TIMESTAMP", onUpdate: "CURRENT_TIMESTAMP", name: "updated_at" })
+  @UpdateDateColumn({ name: "updated_at" })
   updatedAt: Date;
 }

auth-service/src/db/entities/User.ts

@@ -1,4 +1,12 @@
-import { Entity, PrimaryGeneratedColumn, Column, BaseEntity } from "typeorm";
+import {
+  Entity,
+  PrimaryGeneratedColumn,
+  Column,
+  BaseEntity,
+  CreateDateColumn,
+  UpdateDateColumn,
+  VersionColumn,
+} from "typeorm";
 
 @Entity("users")
 export default class User extends BaseEntity {
@@ -29,9 +37,12 @@ export default class User extends BaseEntity {
   @Column("bool", { name: "is_email_confirmed", default: false })
   isEmailConfirmed: boolean;
 
-  @Column({ type: "timestamp", default: () => "CURRENT_TIMESTAMP", name: "created_at" })
+  @CreateDateColumn({ name: "created_at" })
   createdAt: Date;
 
-  @Column({ type: "timestamp", default: () => "CURRENT_TIMESTAMP", onUpdate: "CURRENT_TIMESTAMP", name: "updated_at" })
+  @UpdateDateColumn({ name: "updated_at" })
   updatedAt: Date;
+
+  @VersionColumn({ default: 1 })
+  version: number;
 }

web-client/package.json

@@ -25,10 +25,12 @@
     "jwt-decode": "^3.1.2",
     "markdown-draft-js": "^2.4.0",
     "moment": "^2.29.1",
+    "moment-timezone": "^0.5.34",
     "notistack": "^2.0.3",
     "qrcode.react": "^1.0.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
+    "react-moment": "^1.1.1",
     "react-query": "^3.34.5",
     "react-redux": "^7.2.6",
     "react-router-dom": "^6.2.1",

web-client/src/App.tsx

@@ -4,10 +4,12 @@ import { QueryClient, QueryClientProvider } from "react-query";
 import { ReactQueryDevtools } from "react-query/devtools";
 import { SnackbarProvider } from "notistack";
 import { useDispatch, useSelector } from "react-redux";
+import "moment-timezone";
 
 import DateAdapter from "@mui/lab/AdapterMoment";
 import Backdrop from "@mui/material/Backdrop";
 import CircularProgress from "@mui/material/CircularProgress";
+import LocalizationProvider from "@mui/lab/LocalizationProvider";
 
 import AppRoutes from "./routes/Routes";
 
@@ -16,7 +18,6 @@ import { selectAppProfileState, selectAuthState, selectLookupListsState } from "
 import { getProfilesThunk } from "./shared/redux/slices/user/thunks";
 import { getRefreshedAccessTokenThunk } from "./shared/redux/slices/auth/thunks";
 import { getAllLookupListsThunk } from "./shared/redux/slices/lookup/thunks";
-import LocalizationProvider from "@mui/lab/LocalizationProvider";
 
 const queryClient = new QueryClient();
 
@@ -71,7 +72,7 @@ const App = () => {
             <AppRoutes />
           </SnackbarProvider>
         </LocalizationProvider>
-        {process.env.NODE_ENV === "production" && <ReactQueryDevtools initialIsOpen={false} />}
+        {process.env.NODE_ENV !== "production" && <ReactQueryDevtools initialIsOpen={false} />}
         {/** only show devtools in development */}
       </QueryClientProvider>
     </ThemeWrapper>

web-client/src/modules/SettingsScreen/Company/CompanyRoles/Table.tsx

@@ -1,4 +1,6 @@
 import React from "react";
+import Moment from "react-moment";
+import { useSelector } from "react-redux";
 
 import { styled } from "@mui/material/styles";
 import Table from "@mui/material/Table";
@@ -16,6 +18,7 @@ import StyledTableCell from "../../../../shared/components/StyledTableCell/Style
 
 import { IRoleProfile } from "../../../../shared/interfaces/Client.interfaces";
 import { usePermission } from "../../../../shared/hooks/usePermission";
+import { selectAppProfileState } from "../../../../shared/redux/store";
 
 const StyledTableRow = styled(TableRow)(({ theme }) => ({
   "&:nth-of-type(odd)": {
@@ -36,6 +39,9 @@ interface ITableProps {
 const ViewTable = ({ dataList, editItemHandler, deleteItemHandler }: ITableProps) => {
   const isDeleteAccessible = usePermission("role:admin");
   const isEditAccessible = usePermission("role:admin");
+
+  const { formats } = useSelector(selectAppProfileState);
+
   const handleEditButton = (role: IRoleProfile) => {
     editItemHandler(role.roleId);
   };
@@ -49,7 +55,7 @@ const ViewTable = ({ dataList, editItemHandler, deleteItemHandler }: ITableProps
           <TableRow>
             <StyledTableCell>Name</StyledTableCell>
             <StyledTableCell width={300}>Created by</StyledTableCell>
-            <StyledTableCell width={300}>Updated At</StyledTableCell>
+            <StyledTableCell width={300}>Last updated</StyledTableCell>
             <StyledTableCell align="right">#</StyledTableCell>
           </TableRow>
         </TableHead>
@@ -66,7 +72,11 @@ const ViewTable = ({ dataList, editItemHandler, deleteItemHandler }: ITableProps
                   <Chip label="System generated" />
                 )}
               </StyledTableCell>
-              <StyledTableCell>{role.updatedAt}</StyledTableCell>
+              <StyledTableCell>
+                <Moment interval={formats.defaultDateRefreshInterval} fromNow>
+                  {role.updatedAt}
+                </Moment>
+              </StyledTableCell>
               <StyledTableCell align="right">
                 {role.isUserDeletable && isDeleteAccessible && (
                   <>

web-client/src/modules/SettingsScreen/Company/CompanyTeams/Table.tsx

@@ -1,4 +1,6 @@
 import React from "react";
+import Moment from "react-moment";
+import { useSelector } from "react-redux";
 
 import { styled } from "@mui/material/styles";
 import Table from "@mui/material/Table";
@@ -16,6 +18,7 @@ import StyledTableCell from "../../../../shared/components/StyledTableCell/Style
 
 import { ITeamProfile } from "../../../../shared/interfaces/Client.interfaces";
 import { usePermission } from "../../../../shared/hooks/usePermission";
+import { selectAppProfileState } from "../../../../shared/redux/store";
 
 const StyledTableRow = styled(TableRow)(({ theme }) => ({
   "&:nth-of-type(odd)": {
@@ -37,6 +40,8 @@ const ViewTable = ({ dataList, editItemHandler, deleteItemHandler }: ITableProps
   const isEditButtonAccessible = usePermission("team:admin");
   const isDeleteButtonAccessible = usePermission("team:admin");
 
+  const { formats } = useSelector(selectAppProfileState);
+
   const handleEditButton = (team: ITeamProfile) => {
     editItemHandler(team.teamId);
   };
@@ -50,7 +55,7 @@ const ViewTable = ({ dataList, editItemHandler, deleteItemHandler }: ITableProps
           <TableRow>
             <StyledTableCell>Name</StyledTableCell>
             <StyledTableCell width={300}>Created by</StyledTableCell>
-            <StyledTableCell width={300}>Updated At</StyledTableCell>
+            <StyledTableCell width={300}>Last updated</StyledTableCell>
             <StyledTableCell align="right">#</StyledTableCell>
           </TableRow>
         </TableHead>
@@ -67,7 +72,11 @@ const ViewTable = ({ dataList, editItemHandler, deleteItemHandler }: ITableProps
                   <Chip label="System generated" />
                 )}
               </StyledTableCell>
-              <StyledTableCell>{team.updatedAt}</StyledTableCell>
+              <StyledTableCell>
+                <Moment interval={formats.defaultDateRefreshInterval} fromNow>
+                  {team.updatedAt}
+                </Moment>
+              </StyledTableCell>
               <StyledTableCell align="right">
                 {team.isUserDeletable && isDeleteButtonAccessible && (
                   <>