Merge branch 'master' into auto-focus

.eslintrc.js

@@ -6,7 +6,6 @@ module.exports = {
     jest: true,
   },
   extends: ["next/core-web-vitals", "plugin:prettier/recommended"],
-  parser: "@typescript-eslint/parser",
   parserOptions: {
     ecmaFeatures: {
       jsx: true,
@@ -21,8 +20,14 @@ module.exports = {
   },
   overrides: [
     {
+      parser: "@typescript-eslint/parser",
       files: ["**/*.ts", "**/*.tsx"],
-      plugins: ["tailwindcss", "react"],
+      plugins: [
+        "tailwindcss",
+        "react",
+        "@typescript-eslint",
+        "simple-import-sort",
+      ],
       extends: [
         "plugin:react/recommended",
         "plugin:tailwindcss/recommended",
@@ -35,6 +40,8 @@ module.exports = {
         project: "./tsconfig.json",
       },
       rules: {
+        "simple-import-sort/imports": "error",
+        "simple-import-sort/exports": "error",
         "@typescript-eslint/no-duplicate-enum-values": "error",
         "@typescript-eslint/consistent-type-imports": "error",
         "@typescript-eslint/no-useless-constructor": "off",
@@ -59,6 +66,7 @@ module.exports = {
         "no-empty-function": "off",
         "no-unused-vars": "off",
         "react/no-danger": "off",
+        "react/no-unstable-nested-components": "off",
         "import/no-extraneous-dependencies": "off",
         "consistent-return": "off",
         "default-case": "off",

package.json

@@ -149,6 +149,7 @@
     "eslint-config-airbnb-typescript": "^18.0.0",
     "eslint-plugin-jest": "^28.6.0",
     "eslint-plugin-jest-formatting": "^3.1.0",
+    "eslint-plugin-simple-import-sort": "^12.1.1",
     "eslint-plugin-tailwindcss": "^3.17.4",
     "fake-indexeddb": "^5.0.2",
     "gettext-parser": "^8.0.0",

scripts/translate.mjs

@@ -1,4 +1,3 @@
-/* eslint-disable no-continue */
 import gettextParser from "gettext-parser";
 
 import fs from "fs";

src/__tests__/_/Provider.tsx

@@ -1,12 +1,13 @@
-import type { ReactNode } from "react";
-import { LinguiProvider } from "translations/utils";
 import type { Messages } from "@lingui/core";
 import {
   QueryCache,
   QueryClient,
   QueryClientProvider,
 } from "@tanstack/react-query";
 import { ThemeProvider } from "next-themes";
+import type { ReactNode } from "react";
+import { LinguiProvider } from "translations/utils";
+
 import { ConfirmAlert } from "@/components/app/confirm-alert";
 import { Toaster } from "@/components/app/toast/toaster";
 

src/__tests__/_/api-handlers/account.ts

@@ -2,6 +2,7 @@ import { AuthActions } from "frontend/hooks/auth/auth.actions";
 import { rest } from "msw";
 import { REQUEST_ERROR_CODES } from "shared/constants/auth";
 import type { IAuthenticatedUserBag } from "shared/types/user";
+
 import { BASE_TEST_URL } from "./_utils";
 
 let ME: IAuthenticatedUserBag = {

src/__tests__/_/api-handlers/auth.ts

@@ -1,4 +1,5 @@
 import { rest } from "msw";
+
 import { BASE_TEST_URL } from "./_utils";
 
 export const authApiHandlers = [

src/__tests__/_/api-handlers/config.ts

@@ -1,6 +1,7 @@
 import { rest } from "msw";
 import type { ITableView } from "shared/types/data";
 import { FilterOperators } from "shared/types/data";
+
 import { BASE_TEST_URL } from "./_utils";
 
 const ENTITY_CONFIG = {};

src/__tests__/_/api-handlers/dashboard.ts

@@ -1,6 +1,7 @@
+import { MutationHelpers } from "frontend/lib/data/useMutate/mutation-helpers";
 import { rest } from "msw";
 import type { IWidgetConfig } from "shared/types/dashboard";
-import { MutationHelpers } from "frontend/lib/data/useMutate/mutation-helpers";
+
 import { BASE_TEST_URL } from "./_utils";
 
 let DASHBOARD_WIDGETS: IWidgetConfig[] = [

src/__tests__/_/api-handlers/data.ts

@@ -1,5 +1,6 @@
 import { rest } from "msw";
 import { reduceStringToNumber } from "shared/lib/strings";
+
 import { BASE_TEST_URL } from "./_utils";
 
 const allData = ({

src/__tests__/_/api-handlers/entities.ts

@@ -1,5 +1,6 @@
 import { rest } from "msw";
 import type { IEntityField } from "shared/types/db";
+
 import { BASE_TEST_URL } from "./_utils";
 
 export const entitiesApiHandlers = [

src/__tests__/_/api-handlers/form-actions.ts

@@ -1,4 +1,5 @@
 import { rest } from "msw";
+
 import { BASE_TEST_URL } from "./_utils";
 
 const FORM_ACTIONS = [

src/__tests__/_/api-handlers/index.ts

@@ -1,18 +1,18 @@
-import { setupApiHandlers } from "./setup";
 import { accountApiHandlers } from "./account";
 import { authApiHandlers } from "./auth";
-import { entitiesApiHandlers } from "./entities";
-import { dataApiHandlers } from "./data";
-import { rolesApiHandlers } from "./roles";
 import { configApiHandlers } from "./config";
 import { dashboardApiHandlers } from "./dashboard";
+import { dataApiHandlers } from "./data";
+import { entitiesApiHandlers } from "./entities";
+import { formActionsApiHandlers } from "./form-actions";
 import { integrationsApiHandlers } from "./integrations";
-import { versionApiHandlers } from "./versions";
-import { portalApiHandlers } from "./portal";
+import { integrationsListApiHandlers } from "./integrations-list";
 import { menuApiHandlers } from "./menu";
+import { portalApiHandlers } from "./portal";
+import { rolesApiHandlers } from "./roles";
+import { setupApiHandlers } from "./setup";
 import { userPreferencesApiHandlers } from "./user-preferences";
-import { formActionsApiHandlers } from "./form-actions";
-import { integrationsListApiHandlers } from "./integrations-list";
+import { versionApiHandlers } from "./versions";
 
 export const apiHandlers = [
   ...setupApiHandlers,

src/__tests__/_/api-handlers/integrations-list.ts

@@ -1,4 +1,5 @@
 import { rest } from "msw";
+
 import { BASE_TEST_URL } from "./_utils";
 
 export const integrationsListApiHandlers = [

src/__tests__/_/api-handlers/integrations.ts

@@ -8,6 +8,7 @@ import type {
 } from "msw";
 import { rest } from "msw";
 import type { IKeyValue } from "shared/types/options";
+
 import { BASE_TEST_URL } from "./_utils";
 
 const CONSTANTS = [

src/__tests__/_/api-handlers/menu.ts

@@ -1,6 +1,7 @@
 import { rest } from "msw";
 import type { INavigationMenuItem } from "shared/types/menu";
 import { NavigationMenuItemType } from "shared/types/menu";
+
 import { BASE_TEST_URL } from "./_utils";
 
 const MENU: INavigationMenuItem[] = [

src/__tests__/_/api-handlers/roles.ts

@@ -1,4 +1,5 @@
 import { rest } from "msw";
+
 import { BASE_TEST_URL } from "./_utils";
 
 let ROLES = [

src/__tests__/_/api-handlers/setup.ts

@@ -1,4 +1,5 @@
 import { rest } from "msw";
+
 import { BASE_TEST_URL } from "./_utils";
 
 export const SETUP_CHECK_DATA = {

src/__tests__/_/api-handlers/user-preferences.ts

@@ -1,4 +1,5 @@
 import { rest } from "msw";
+
 import { BASE_TEST_URL } from "./_utils";
 
 const USER_PREFERENCES = {

src/__tests__/_/api-handlers/versions.ts

@@ -1,4 +1,5 @@
 import { rest } from "msw";
+
 import { BASE_TEST_URL } from "./_utils";
 
 export const versionApiHandlers = [

src/__tests__/_/setupAfterEnv.ts

@@ -1,6 +1,7 @@
-import { cleanup } from "@testing-library/react";
 import "@testing-library/jest-dom/extend-expect";
 
+import { cleanup } from "@testing-library/react";
+
 afterEach(() => {
   cleanup();
 });

src/__tests__/_/setupApihandlers.ts

@@ -1,5 +1,6 @@
-import { setupServer } from "msw/node";
 import { AuthActions } from "frontend/hooks/auth/auth.actions";
+import { setupServer } from "msw/node";
+
 import { apiHandlers } from "./api-handlers";
 
 export const server = setupServer(...apiHandlers);

src/__tests__/_/utils/closeAllToasts.ts

@@ -1,5 +1,7 @@
 import { screen, within } from "@testing-library/react";
-import userEvent from "@testing-library/user-event";
+import userEvent, {
+  PointerEventsCheckLevel,
+} from "@testing-library/user-event";
 
 export const closeAllToasts = async () => {
   await userEvent.keyboard("{Escape}");
@@ -15,3 +17,14 @@ export const getToastMessage = async () => {
   return (await within(screen.getByRole("region")).findByRole("status"))
     .textContent;
 };
+
+export const confirmDelete = async () => {
+  const confirmBox = await screen.findByRole("alertdialog", {
+    name: "Confirm Delete",
+  });
+
+  await userEvent.click(
+    await within(confirmBox).findByRole("button", { name: "Continue" }),
+    { pointerEventsCheck: PointerEventsCheckLevel.Never }
+  );
+};

src/__tests__/_app.spec.tsx

@@ -1,7 +1,7 @@
 import { render, screen } from "@testing-library/react";
-
-import MyApp from "pages/_app";
 import type { CustomNextPage } from "frontend/_layouts/types";
+import MyApp from "pages/_app";
+
 import { USE_ROUTER_PARAMS } from "./_/constants";
 
 describe("pages/users", () => {
@@ -19,7 +19,6 @@ describe("pages/users", () => {
 
     render(
       <MyApp
-        // eslint-disable-next-line react/jsx-no-bind
         Component={Foo}
         pageProps={{ title: "Hello" }}
         router={jest.fn as any}

src/__tests__/account/logout.spec.tsx

@@ -1,11 +1,10 @@
+import { USE_ROUTER_PARAMS } from "__tests__/_/constants";
+import { TestProviders } from "__tests__/_/Provider";
+import { setupApiHandlers } from "__tests__/_/setupApihandlers";
 import { render, screen, waitFor } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import AccountPassword from "pages/account/password";
 
-import { setupApiHandlers } from "__tests__/_/setupApihandlers";
-import { USE_ROUTER_PARAMS } from "__tests__/_/constants";
-import { TestProviders } from "__tests__/_/Provider";
-
 Object.defineProperty(window, "location", {
   value: {
     ...window.location,

src/__tests__/account/password.spec.tsx

@@ -1,13 +1,13 @@
-import { render, screen } from "@testing-library/react";
-import userEvent from "@testing-library/user-event";
-import AccountPassword from "pages/account/password";
+import { USE_ROUTER_PARAMS } from "__tests__/_/constants";
 import { TestProviders } from "__tests__/_/Provider";
 import { setupApiHandlers } from "__tests__/_/setupApihandlers";
 import {
   closeAllToasts,
   getToastMessage,
 } from "__tests__/_/utils/closeAllToasts";
-import { USE_ROUTER_PARAMS } from "__tests__/_/constants";
+import { render, screen } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import AccountPassword from "pages/account/password";
 
 setupApiHandlers();
 

src/__tests__/account/preferences.spec.tsx

@@ -1,10 +1,10 @@
+import { USE_ROUTER_PARAMS } from "__tests__/_/constants";
+import { TestProviders } from "__tests__/_/Provider";
+import { setupApiHandlers } from "__tests__/_/setupApihandlers";
 import { render, screen, waitFor } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import UserPreferences from "pages/account/preferences";
 
-import { setupApiHandlers } from "__tests__/_/setupApihandlers";
-import { USE_ROUTER_PARAMS } from "__tests__/_/constants";
-import { TestProviders } from "__tests__/_/Provider";
 import { getToastMessage } from "../_/utils/closeAllToasts";
 
 setupApiHandlers();

src/__tests__/account/profile.spec.tsx

@@ -1,10 +1,10 @@
+import { USE_ROUTER_PARAMS } from "__tests__/_/constants";
+import { TestProviders } from "__tests__/_/Provider";
+import { setupApiHandlers } from "__tests__/_/setupApihandlers";
 import { render, screen, waitFor } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import AccountProfile from "pages/account/profile";
 
-import { setupApiHandlers } from "__tests__/_/setupApihandlers";
-import { USE_ROUTER_PARAMS } from "__tests__/_/constants";
-import { TestProviders } from "__tests__/_/Provider";
 import { getToastMessage } from "../_/utils/closeAllToasts";
 
 setupApiHandlers();

src/__tests__/admin/[entity]/[id]/index.spec.tsx

@@ -1,9 +1,8 @@
-import { render, screen } from "@testing-library/react";
-import EntityDetails from "pages/admin/[entity]/[id]/index";
-
-import { setupApiHandlers } from "__tests__/_/setupApihandlers";
 import { USE_ROUTER_PARAMS } from "__tests__/_/constants";
 import { TestProviders } from "__tests__/_/Provider";
+import { setupApiHandlers } from "__tests__/_/setupApihandlers";
+import { render, screen } from "@testing-library/react";
+import EntityDetails from "pages/admin/[entity]/[id]/index";
 
 setupApiHandlers();
 

src/__tests__/admin/[entity]/[id]/update.spec.tsx

@@ -1,9 +1,8 @@
-import { render, screen, waitFor } from "@testing-library/react";
-import EntityUpdate from "pages/admin/[entity]/[id]/update";
-
-import { setupApiHandlers } from "__tests__/_/setupApihandlers";
 import { USE_ROUTER_PARAMS } from "__tests__/_/constants";
 import { TestProviders } from "__tests__/_/Provider";
+import { setupApiHandlers } from "__tests__/_/setupApihandlers";
+import { render, screen, waitFor } from "@testing-library/react";
+import EntityUpdate from "pages/admin/[entity]/[id]/update";
 
 setupApiHandlers();