diff --git a/src/app/orgs/[orgId]/users/[userId]/page.tsx b/src/app/orgs/[orgId]/users/[userId]/page.tsx
index d1397c86..47340477 100644
--- a/src/app/orgs/[orgId]/users/[userId]/page.tsx
+++ b/src/app/orgs/[orgId]/users/[userId]/page.tsx
@@ -1,10 +1,12 @@
import { UsersActionsSpaceRoles } from '@/components/UsersActions/UsersActionsSpaceRoles/UsersActionsSpaceRoles';
-export default async function OrgUserSpaceRolesPage({
- params,
-}: {
- params: { orgId: string; userId: string };
-}) {
+type Params = Promise<{
+ orgId: string;
+ userId: string;
+}>;
+
+export default async function OrgUserSpaceRolesPage(props: { params: Params }) {
+ const params = await props.params;
return (
);
diff --git a/src/app/orgs/[orgId]/users/add/layout.tsx b/src/app/orgs/[orgId]/users/add/layout.tsx
index 9c26c6b6..133b7243 100644
--- a/src/app/orgs/[orgId]/users/add/layout.tsx
+++ b/src/app/orgs/[orgId]/users/add/layout.tsx
@@ -1,15 +1,14 @@
import React from 'react';
import Link from 'next/link';
-export default function AddUserLayout({
- children,
- params,
-}: {
+type Params = Promise<{ orgId: string }>;
+
+export default async function AddUserLayout(props: {
children: React.ReactNode;
- params: {
- orgId: string;
- };
+ params: Params;
}) {
+ const params = await props.params;
+ const children = await props.children;
return (
<>
diff --git a/src/app/orgs/[orgId]/users/add/page.tsx b/src/app/orgs/[orgId]/users/add/page.tsx
index 69040bd1..d7aa37d0 100644
--- a/src/app/orgs/[orgId]/users/add/page.tsx
+++ b/src/app/orgs/[orgId]/users/add/page.tsx
@@ -1,12 +1,9 @@
import { OrgActionsAddUser } from '@/components/OrgActions/OrgActionsAddUser';
-export default function AddUserPage({
- params,
-}: {
- params: {
- orgId: string;
- };
-}) {
+type Params = Promise<{ orgId: string }>;
+
+export default async function AddUserPage(props: { params: Params }) {
+ const params = await props.params;
return (
<>
diff --git a/src/app/orgs/[orgId]/users/page.tsx b/src/app/orgs/[orgId]/users/page.tsx
index 06d3d8e4..5605b3ca 100644
--- a/src/app/orgs/[orgId]/users/page.tsx
+++ b/src/app/orgs/[orgId]/users/page.tsx
@@ -12,11 +12,10 @@ import { PageHeader } from '@/components/PageHeader';
import { AddUserButton } from '@/components/UsersList/AddUserButton';
import { Alert } from '@/components/uswds/Alert';
-export default async function OrgUsersPage({
- params,
-}: {
- params: { orgId: string };
-}) {
+type Params = Promise<{ orgId: string }>;
+
+export default async function OrgUsersPage(props: { params: Params }) {
+ const params = await props.params;
const { payload } = await getOrgUsersPage(params.orgId);
const { roles, serviceAccounts, spaces, users, currentUserRoles } = payload;
const allowManageUsers = currentUserRoles.find(
diff --git a/src/app/prototype/cloudfoundry/orgs/[orgGuid]/page.tsx b/src/app/prototype/cloudfoundry/orgs/[orgGuid]/page.tsx
index ffd4d558..8e0d286d 100644
--- a/src/app/prototype/cloudfoundry/orgs/[orgGuid]/page.tsx
+++ b/src/app/prototype/cloudfoundry/orgs/[orgGuid]/page.tsx
@@ -7,13 +7,10 @@ import { RoleType } from '@/api/cf/cloudfoundry-types';
import { UserAction } from './form';
import { OrgMembersList } from '@/components/CloudFoundry/OrgMembersList';
-export default async function OrgPage({
- params,
-}: {
- params: {
- orgGuid: string;
- };
-}) {
+type Params = Promise<{ orgGuid: string }>;
+
+export default async function OrgPage(props: { params: Params }) {
+ const params = await props.params;
const controllerRes = (await getOrgPage(params.orgGuid)) as ControllerResult;
const { org, users, spaces } = controllerRes.payload;
diff --git a/src/app/prototype/cloudfoundry/orgs/[orgGuid]/spaces/[spaceGuid]/page.tsx b/src/app/prototype/cloudfoundry/orgs/[orgGuid]/spaces/[spaceGuid]/page.tsx
index 885009e5..e81aa7bb 100644
--- a/src/app/prototype/cloudfoundry/orgs/[orgGuid]/spaces/[spaceGuid]/page.tsx
+++ b/src/app/prototype/cloudfoundry/orgs/[orgGuid]/spaces/[spaceGuid]/page.tsx
@@ -9,14 +9,10 @@ import {
import { UserAction } from './form';
import { SpaceMembersList } from '@/components/CloudFoundry/SpaceMembersList';
-export default async function SpacePage({
- params,
-}: {
- params: {
- orgGuid: string;
- spaceGuid: string;
- };
-}) {
+type Params = Promise<{ orgGuid: string; spaceGuid: string }>;
+
+export default async function SpacePage(props: { params: Params }) {
+ const params = await props.params;
try {
const spaceRes = await getSpace(params.spaceGuid);
const users = await getSpaceUsers(params.spaceGuid);
diff --git a/src/app/prototype/session/page.js b/src/app/prototype/session/page.js
index 60218341..16942673 100644
--- a/src/app/prototype/session/page.js
+++ b/src/app/prototype/session/page.js
@@ -13,7 +13,7 @@ export default function Page() {
try {
const res = await getData('/api/session');
setSessionData(res['rows']);
- } catch (error) {
+ } catch {
// placeholder so the page still displays until we
// implement better error handling logic
setSessionData([]);
diff --git a/src/components/BlogSnippet/BlogSnippet.tsx b/src/components/BlogSnippet/BlogSnippet.tsx
index ad4953be..21b775cf 100644
--- a/src/components/BlogSnippet/BlogSnippet.tsx
+++ b/src/components/BlogSnippet/BlogSnippet.tsx
@@ -53,7 +53,7 @@ export async function BlogSnippet() {
);
- } catch (error: any) {
+ } catch {
return
Blog not available
;
}
}
diff --git a/src/components/LastViewedOrgLink.tsx b/src/components/LastViewedOrgLink.tsx
index 58c8276c..f7217470 100644
--- a/src/components/LastViewedOrgLink.tsx
+++ b/src/components/LastViewedOrgLink.tsx
@@ -3,7 +3,7 @@ import { cookies } from 'next/headers';
import { getOrg } from '@/api/cf/cloudfoundry';
export async function LastViewedOrgLink() {
- const cookieStore = cookies();
+ const cookieStore = await cookies();
const orgId = cookieStore.get('lastViewedOrgId')?.value;
if (!orgId) {
return null;
diff --git a/src/components/OrgActions/OrgActionsAddUser.tsx b/src/components/OrgActions/OrgActionsAddUser.tsx
index e6f1e566..8c0d0775 100644
--- a/src/components/OrgActions/OrgActionsAddUser.tsx
+++ b/src/components/OrgActions/OrgActionsAddUser.tsx
@@ -49,7 +49,7 @@ export function OrgActionsAddUser({
setActionStatus('success' as ActionStatus);
}
});
- } catch (e: any) {
+ } catch {
setActionStatus('error' as ActionStatus);
setActionErrors([
'Something went wrong with the request. Please try again.',
diff --git a/src/components/auth/Auth.tsx b/src/components/auth/Auth.tsx
index 47fe2319..e270aedb 100644
--- a/src/components/auth/Auth.tsx
+++ b/src/components/auth/Auth.tsx
@@ -2,8 +2,8 @@ import { isLoggedIn } from '@/api/cf/token';
import { LoginButton } from '@/components/auth/LoginButton';
import { LogoutButton } from '@/components/auth/LogoutButton';
-export function Auth() {
- if (isLoggedIn()) {
+export async function Auth() {
+ if (await isLoggedIn()) {
return
;
} else {
return
;
diff --git a/src/components/uswds/Button.tsx b/src/components/uswds/Button.tsx
index 437d408e..1fbf6b32 100644
--- a/src/components/uswds/Button.tsx
+++ b/src/components/uswds/Button.tsx
@@ -30,7 +30,7 @@ export function Button({
unstyled,
...defaultProps
// eslint-disable-next-line no-undef
-}: ButtonProps & JSX.IntrinsicElements['button']): React.ReactElement {
+}: ButtonProps & React.JSX.IntrinsicElements['button']): React.ReactElement {
const classes = classnames(
'usa-button',
{
diff --git a/src/components/uswds/Checkbox.tsx b/src/components/uswds/Checkbox.tsx
index 6c5aed84..a3a7c18a 100644
--- a/src/components/uswds/Checkbox.tsx
+++ b/src/components/uswds/Checkbox.tsx
@@ -26,7 +26,8 @@ export const Checkbox = ({
tile,
...inputProps
// eslint-disable-next-line no-undef
-}: CheckboxProps & JSX.IntrinsicElements['input']): React.ReactElement => {
+}: CheckboxProps &
+ React.JSX.IntrinsicElements['input']): React.ReactElement => {
const classes = classnames('usa-checkbox', className);
const checkboxClasses = classnames('usa-checkbox__input', {
'usa-checkbox__input--tile': tile,
diff --git a/src/controllers/controllers.ts b/src/controllers/controllers.ts
index cd82614b..ebaf529e 100644
--- a/src/controllers/controllers.ts
+++ b/src/controllers/controllers.ts
@@ -42,7 +42,7 @@ export async function getOrgLandingpage(): Promise
{
const orgsRes = await CF.getOrgs();
const orgs = (await orgsRes.json()).resources;
let currentOrgId;
- const cookieStore = cookies();
+ const cookieStore = await cookies();
const lastViewedOrgId = cookieStore.get('lastViewedOrgId')?.value;
if (lastViewedOrgId) {
currentOrgId = lastViewedOrgId;
diff --git a/tsconfig.json b/tsconfig.json
index 5d3c2139..65caf106 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,6 +1,10 @@
{
"compilerOptions": {
- "lib": ["dom", "dom.iterable", "esnext"],
+ "lib": [
+ "dom",
+ "dom.iterable",
+ "esnext"
+ ],
"allowJs": true,
"noImplicitAny": true,
"strictNullChecks": true,
@@ -17,14 +21,24 @@
// baseUrl required to use path aliases
"baseUrl": ".",
"paths": {
- "@/*": ["./src/*"]
+ "@/*": [
+ "./src/*"
+ ]
},
"plugins": [
{
"name": "next"
}
- ]
+ ],
+ "target": "ES2017"
},
- "include": ["next-env.d.ts", ".next/types/**/*.ts", "**/*.ts", "**/*.tsx"],
- "exclude": ["node_modules"]
+ "include": [
+ "next-env.d.ts",
+ ".next/types/**/*.ts",
+ "**/*.ts",
+ "**/*.tsx"
+ ],
+ "exclude": [
+ "node_modules"
+ ]
}