Merge branch 'main' into h2-update

api/build.gradle

@@ -67,8 +67,8 @@ dependencies {
     implementation 'org.apache.commons:commons-csv:1.8'
     implementation 'org.apache.commons:commons-lang3:3.12.0'
     implementation 'org.apache.httpcomponents:httpclient:4.5.13'
-    implementation 'org.liquibase:liquibase-core:4.3.5'
-    implementation 'org.springdoc:springdoc-openapi-ui:1.5.9'
+    implementation 'org.liquibase:liquibase-core:4.8.0'
+    implementation 'org.springdoc:springdoc-openapi-ui:1.7.0'
 
     // https://mvnrepository.com/artifact/com.google.code.findbugs/jsr305
     compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
@@ -82,7 +82,7 @@ dependencies {
 
     developmentOnly 'org.springframework.boot:spring-boot-devtools'
 
-    runtimeOnly 'org.postgresql:postgresql:42.4.0'
+    runtimeOnly 'org.postgresql:postgresql:42.4.3'
 }
 
 static def noProfileOrDbDefined(tasks) {

ui/src/App/App.tsx

@@ -54,7 +54,7 @@ function App() {
 	const theme = useRecoilValue(ThemeState);
 
 	const environmentConfig = useEnvironmentConfig();
-	const { email_is_enabled = true } = environmentConfig || {};
+	const { email_is_enabled = true } = environmentConfig ?? {};
 
 	useEffect(() => {
 		document.body.className = getThemeClassFromUserSettings();
@@ -78,34 +78,26 @@ function App() {
 					<Route path="radiator" element={<RadiatorPage />} />
 				</Route>
 				{email_is_enabled && (
-					<Route path="/email/reset" element={<ChangeTeamDetailsPage />} />
-				)}
-				{email_is_enabled && (
-					<Route path="/password/reset" element={<ResetPasswordPage />} />
-				)}
-				{email_is_enabled && (
-					<Route
-						path={EXPIRED_PASSWORD_RESET_LINK_PATH}
-						element={<ExpiredResetPasswordLinkPage />}
-					/>
-				)}
-				{email_is_enabled && (
-					<Route
-						path={EXPIRED_EMAIL_RESET_LINK_PATH}
-						element={<ExpiredResetBoardOwnersLinkPage />}
-					/>
-				)}
-				{email_is_enabled && (
-					<Route
-						path={PASSWORD_RESET_REQUEST_PATH}
-						element={<PasswordResetRequestPage />}
-					/>
-				)}
-				{email_is_enabled && (
-					<Route
-						path={RECOVER_TEAM_NAME_PATH}
-						element={<RecoverTeamNamePage />}
-					/>
+					<>
+						<Route path="/email/reset" element={<ChangeTeamDetailsPage />} />
+						<Route path="/password/reset" element={<ResetPasswordPage />} />
+						<Route
+							path={EXPIRED_PASSWORD_RESET_LINK_PATH}
+							element={<ExpiredResetPasswordLinkPage />}
+						/>
+						<Route
+							path={EXPIRED_EMAIL_RESET_LINK_PATH}
+							element={<ExpiredResetBoardOwnersLinkPage />}
+						/>
+						<Route
+							path={PASSWORD_RESET_REQUEST_PATH}
+							element={<PasswordResetRequestPage />}
+						/>
+						<Route
+							path={RECOVER_TEAM_NAME_PATH}
+							element={<RecoverTeamNamePage />}
+						/>
+					</>
 				)}
 				<Route path="*" element={<PageNotFoundPage />} />
 			</Routes>

ui/src/App/ChangeTeamDetails/ChangeTeamDetailsPage.tsx

@@ -35,10 +35,10 @@ interface ValueAndValidity {
 	validity: boolean;
 }
 
-function ChangeTeamDetailsPage(): JSX.Element {
+function ChangeTeamDetailsPage(): React.ReactElement {
 	const { search } = useLocation();
 	const navigate = useNavigate();
-	const emailResetToken = new URLSearchParams(search).get('token') || 'invalid';
+	const emailResetToken = new URLSearchParams(search).get('token') ?? 'invalid';
 
 	const [email, setEmail] = useState<ValueAndValidity>(blankValueWithValidity);
 	const [secondaryEmail, setSecondaryEmail] = useState<ValueAndValidity>({

ui/src/App/CreateTeam/CreateTeamPage.tsx

@@ -35,7 +35,7 @@ interface ValueAndValidity {
 	validity: boolean;
 }
 
-function CreateTeamPage(): JSX.Element {
+function CreateTeamPage(): React.ReactElement {
 	const { login } = useAuth();
 
 	const [teamName, setTeamName] = useState<ValueAndValidity>(

ui/src/App/Login/LoginPage.tsx

@@ -34,7 +34,7 @@ import { EnvironmentConfigState } from 'State/EnvironmentConfigState';
 
 import './LoginPage.scss';
 
-function LoginPage(): JSX.Element {
+function LoginPage(): React.ReactElement {
 	const { teamId = '' } = useParams();
 
 	const { login } = useAuth();

ui/src/App/PasswordResetRequest/PasswordResetRequestPage.tsx

@@ -24,7 +24,7 @@ import LinkTertiary from 'Common/LinkTertiary/LinkTertiary';
 import useEnvironmentConfig from 'Hooks/useEnvironmentConfig';
 import EmailService from 'Services/Api/EmailService';
 
-function PasswordResetRequestPage(): JSX.Element {
+function PasswordResetRequestPage(): React.ReactElement {
 	const [emailSent, setEmailSent] = useState<boolean>(false);
 	const [errorMessages, setErrorMessages] = useState<string[]>([]);
 

ui/src/App/ResetPassword/ResetPasswordPage.tsx

@@ -32,11 +32,11 @@ import {
 
 import './ResetPasswordPage.scss';
 
-function ResetPasswordPage(): JSX.Element {
+function ResetPasswordPage(): React.ReactElement {
 	const { search } = useLocation();
 	const navigate = useNavigate();
 	const passwordResetToken =
-		new URLSearchParams(search).get('token') || 'invalid';
+		new URLSearchParams(search).get('token') ?? 'invalid';
 
 	const [newPassword, setNewPassword] = useState<string>('');
 	const [isFormSubmitted, setIsFormSubmitted] = useState(false);

ui/src/App/Team/Archives/ActionItemArchives/DeleteMultipleActionItemsConfirmation/DeleteMultipleActionItemsConfirmation.tsx

@@ -26,7 +26,7 @@ interface Props {
 	onActionItemDeletion(): void;
 }
 
-function DeleteMultipleActionItemsConfirmation(props: Props) {
+function DeleteMultipleActionItemsConfirmation(props: Readonly<Props>) {
 	const { actionItemIds, onActionItemDeletion } = props;
 
 	const team = useRecoilValue(TeamState);

ui/src/App/Team/Archives/ActionItemArchives/DeleteSingleActionItemConfirmation/DeleteSingleActionItemConfirmation.tsx

@@ -26,7 +26,7 @@ interface Props {
 	onActionItemDeletion(): void;
 }
 
-function DeleteSingleActionItemConfirmation(props: Props) {
+function DeleteSingleActionItemConfirmation(props: Readonly<Props>) {
 	const { actionItemId, onActionItemDeletion } = props;
 
 	const team = useRecoilValue(TeamState);

ui/src/App/Team/Archives/ArchivesPage.tsx

@@ -20,7 +20,7 @@ import { Outlet } from 'react-router-dom';
 
 import ArchivesSubheader from './ArchivesSubheader/ArchivesSubheader';
 
-function ArchivesPage(): JSX.Element {
+function ArchivesPage(): React.ReactElement {
 	return (
 		<div className="archives-page">
 			<ArchivesSubheader />

ui/src/App/Team/Archives/ArchivesSubheader/ArchivesSubheader.tsx

@@ -20,7 +20,7 @@ import { NavLink } from 'react-router-dom';
 
 import './ArchivesSubheader.scss';
 
-function ArchivesSubheader(): JSX.Element {
+function ArchivesSubheader(): React.ReactElement {
 	return (
 		<div className="archives-subheader">
 			<ul className="archives-subheader-links">

ui/src/App/Team/Archives/Pagination/Pagination.tsx

@@ -25,7 +25,7 @@ interface Props {
 	onPageChange(pageIndex: number): void;
 }
 
-function Pagination(props: Props) {
+function Pagination(props: Readonly<Props>) {
 	const { pageCount, onPageChange } = props;
 
 	return pageCount > 1 ? (

ui/src/App/Team/Archives/ThoughtArchives/ArchivedBoard/ArchivedBoard.tsx

@@ -27,7 +27,7 @@ import ArchivedBoardColumn from './ArchivedBoardColumn/ArchivedBoardColumn';
 
 import './ArchivedBoard.scss';
 
-function ArchivedBoard(): JSX.Element {
+function ArchivedBoard(): React.ReactElement {
 	const { boardId } = useParams();
 
 	const team = useRecoilValue(TeamState);

ui/src/App/Team/Archives/ThoughtArchives/ArchivedBoard/ArchivedBoardColumn/ArchivedBoardColumn.tsx

@@ -34,7 +34,9 @@ interface ThoughtProps {
 	thought: Thought;
 }
 
-function ArchivedBoardThought({ thought }: ThoughtProps): JSX.Element {
+function ArchivedBoardThought({
+	thought,
+}: Readonly<ThoughtProps>): React.ReactElement {
 	return (
 		<li data-testid={'thought' + thought.id} className="archived-thought">
 			<p className="message">{thought.message}</p>
@@ -48,7 +50,10 @@ function ArchivedBoardThought({ thought }: ThoughtProps): JSX.Element {
 	);
 }
 
-function ArchivedBoardColumn({ column, thoughts }: ColumnProps): JSX.Element {
+function ArchivedBoardColumn({
+	column,
+	thoughts,
+}: Readonly<ColumnProps>): React.ReactElement {
 	return (
 		<div data-testid="archived-column" className="archived-column">
 			<ColumnHeader initialTitle={column.title} type={column.topic} />

ui/src/App/Team/Archives/ThoughtArchives/ArchivedBoardsList/ArchivedBoardTile/ArchivedBoardTile.tsx

@@ -34,7 +34,7 @@ interface Props {
 	isSelected: boolean;
 }
 
-function ArchivedBoardTile(props: Props): JSX.Element {
+function ArchivedBoardTile(props: Readonly<Props>): React.ReactElement {
 	const { board, onBoardDeletion, onBoardCheckboxClick, isSelected } = props;
 
 	const setModalContents = useSetRecoilState(ModalContentsState);

ui/src/App/Team/Archives/ThoughtArchives/ArchivedBoardsList/ArchivedBoardsList.tsx

@@ -37,7 +37,7 @@ import './ArchivedBoardsList.scss';
 
 const PAGE_SIZE = 20;
 
-function ArchivedBoardsList(): JSX.Element {
+function ArchivedBoardsList(): React.ReactElement {
 	const [boards, setBoards] = useState<Board[]>([]);
 	const [paginationData, setPaginationData] = useState<PaginationData>();
 	const team = useRecoilValue(TeamState);

ui/src/App/Team/Archives/ThoughtArchives/ArchivedBoardsList/ArchivedBoardsListHeader/ArchivedBoardListHeader.tsx

@@ -31,7 +31,7 @@ interface Props {
 	areAllSelected?: boolean;
 }
 
-function ArchivedBoardListHeader(props: Props) {
+function ArchivedBoardListHeader(props: Readonly<Props>) {
 	const { onDateClick, onSelectAllClick, areAllSelected = false } = props;
 
 	const [sortOrder, setSortOrder] = useState<SortOrder>(SortOrder.DESC);

ui/src/App/Team/Archives/ThoughtArchives/ArchivedBoardsList/DeleteBoardConfirmation/DeleteBoardConfirmation.tsx

@@ -26,7 +26,7 @@ interface Props {
 	onBoardDeletion(): void;
 }
 
-function DeleteBoardConfirmation(props: Props) {
+function DeleteBoardConfirmation(props: Readonly<Props>) {
 	const { boardId, onBoardDeletion } = props;
 
 	const team = useRecoilValue(TeamState);

ui/src/App/Team/Archives/ThoughtArchives/ArchivedBoardsList/DeleteBoardsConfirmation/DeleteBoardsConfirmation.tsx

@@ -26,7 +26,7 @@ interface Props {
 	onBoardDeletion(): void;
 }
 
-function DeleteBoardsConfirmation(props: Props) {
+function DeleteBoardsConfirmation(props: Readonly<Props>) {
 	const { boardIds, onBoardDeletion } = props;
 
 	const team = useRecoilValue(TeamState);

ui/src/App/Team/Radiator/RadiatorPage.tsx

@@ -29,7 +29,7 @@ import { TeamState } from '../../../State/TeamState';
 
 import './RadiatorPage.scss';
 
-function RadiatorPage(): JSX.Element {
+function RadiatorPage(): React.ReactElement {
 	const team = useRecoilValue(TeamState);
 	const setActionItems = useSetRecoilState(ActionItemState);
 	const activeActionItems = useRecoilValue(ActiveActionItemsState);
@@ -57,9 +57,9 @@ function RadiatorPage(): JSX.Element {
 							Take a look at all your team's active action items
 						</p>
 						<ul className="radiator-page-action-items">
-							{activeActionItems.map((actionItem, index) => {
+							{activeActionItems.map((actionItem) => {
 								return (
-									<li key={`radiator-action-item-${index}`}>
+									<li key={`radiator-action-item-${actionItem.id}`}>
 										<ActionItemDisplayOnly actionItem={actionItem} />
 									</li>
 								);

ui/src/App/Team/Retro/ActionItemsColumn/ActionItem/ActionItem.tsx

@@ -34,7 +34,7 @@ interface Props {
 	actionItemId: number;
 }
 
-function ActionItem(props: Props) {
+function ActionItem(props: Readonly<Props>) {
 	const { actionItemId } = props;
 
 	const actionItem = useRecoilValue(ActionItemByIdState(actionItemId));

ui/src/App/Team/Retro/ActionItemsColumn/ActionItem/DefaultActionItemView/DefaultActionItemView.tsx

@@ -42,7 +42,7 @@ interface Props {
 	setActionItemMinHeight: (height: number | undefined) => void;
 }
 
-function DefaultActionItemView(props: Props) {
+function DefaultActionItemView(props: Readonly<Props>) {
 	const { actionItem, setViewState, setActionItemMinHeight } = props;
 
 	const team = useRecoilValue(TeamState);

ui/src/App/Team/Retro/ActionItemsColumn/ActionItem/DeleteActionItemView/DeleteActionItemView.tsx

@@ -30,7 +30,7 @@ interface Props {
 	height: number | undefined;
 }
 
-function DeleteActionItemView(props: Props) {
+function DeleteActionItemView(props: Readonly<Props>) {
 	const { actionItemId, setViewState, height } = props;
 
 	const setModalContents = useSetRecoilState(ModalContentsState);

ui/src/App/Team/Retro/ActionItemsColumn/ActionItem/EditActionItemView/EditActionItemView.tsx

@@ -30,7 +30,7 @@ interface Props {
 	setViewState: (viewState: ActionItemViewState) => void;
 }
 
-function EditActionItemView(props: Props) {
+function EditActionItemView(props: Readonly<Props>) {
 	const { actionItem, setViewState } = props;
 
 	const team = useRecoilValue(TeamState);

ui/src/App/Team/Retro/ActionItemsColumn/ActionItemsColumn.tsx

@@ -43,15 +43,15 @@ function ActionItemsColumn() {
 	);
 
 	const createActionItem = (task: string) => {
-		if (task && task.length) {
+		if (task?.length) {
 			const assigneesArray: string[] | null =
 				ActionItemService.parseAssignees(task);
 			const updatedTask: string = ActionItemService.removeAssigneesFromTask(
 				task,
 				assigneesArray
 			);
 
-			if (updatedTask && updatedTask.length) {
+			if (updatedTask?.length) {
 				const maxAssigneeLength = 50;
 				const assignees = assigneesArray
 					? assigneesArray.join(', ').substring(0, maxAssigneeLength)

ui/src/App/Team/Retro/MobileColumnNav/MobileColumnNav.tsx

@@ -28,7 +28,7 @@ interface Props {
 	setSelectedIndex(index: number): void;
 }
 
-function MobileColumnNav(props: Props): JSX.Element {
+function MobileColumnNav(props: Readonly<Props>): React.ReactElement {
 	const { columns = [], selectedIndex, setSelectedIndex } = props;
 
 	const isSelectedIndex = (index: number): boolean => index === selectedIndex;

ui/src/App/Team/Retro/RetroPage.tsx

@@ -155,7 +155,7 @@ function RetroPage(): ReactElement {
 							{columns.map((column, index) => {
 								return (
 									<div
-										key={`column-${index}`}
+										key={`column-${column.id}`}
 										className={classNames('column-container', {
 											selected: index === selectedMobileColumnIndex,
 										})}

ui/src/App/Team/Retro/RetroSubheader/FeedbackForm/FeedbackStars/FeedbackStars.tsx

@@ -25,7 +25,7 @@ type FeedbackStarsProps = {
 	onChange: (stars: number) => void;
 };
 
-function FeedbackStars(props: FeedbackStarsProps) {
+function FeedbackStars(props: Readonly<FeedbackStarsProps>) {
 	const { value, onChange } = props;
 	const [hoveredStarValue, setHoveredStarValue] = useState<number>(-1);
 

ui/src/App/Team/Retro/RetroSubheader/RetroSubheader.tsx

@@ -30,7 +30,7 @@ import FeedbackForm from './FeedbackForm/FeedbackForm';
 
 import './RetroSubheader.scss';
 
-function RetroSubheader(): JSX.Element {
+function RetroSubheader(): React.ReactElement {
 	const { logout } = useAuth();
 
 	const setModalContents = useSetRecoilState(ModalContentsState);