Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(imports): revert default import fix eslint #566

Merged
merged 1 commit into from
Feb 19, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion server/src/config.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import * as env from "env-var";
/* eslint-disable-next-line import/default */
import env from "env-var";

const environement = env.get("ENV").required().asEnum(["local", "recette1", "recette2", "production", "test"]);

Check warning on line 4 in server/src/config.ts

View workflow job for this annotation

GitHub Actions / Tests

Caution: `env` also has a named export `get`. Check if you meant to write `import {get} from 'env-var'` instead
const publicUrl = env.get("PUBLIC_URL").required().asString();

Check warning on line 5 in server/src/config.ts

View workflow job for this annotation

GitHub Actions / Tests

Caution: `env` also has a named export `get`. Check if you meant to write `import {get} from 'env-var'` instead

// if (process.env.NODE_ENV === "test") {
// dotenv.config({
Expand All @@ -12,20 +13,20 @@
// }

const config = {
productName: env.get("PUBLIC_PRODUCT_NAME").required().asString(),

Check warning on line 16 in server/src/config.ts

View workflow job for this annotation

GitHub Actions / Tests

Caution: `env` also has a named export `get`. Check if you meant to write `import {get} from 'env-var'` instead
port: env.get("SERVER_PORT").required().asPortNumber(),

Check warning on line 17 in server/src/config.ts

View workflow job for this annotation

GitHub Actions / Tests

Caution: `env` also has a named export `get`. Check if you meant to write `import {get} from 'env-var'` instead
version: env.get("PUBLIC_VERSION").required().asString(),

Check warning on line 18 in server/src/config.ts

View workflow job for this annotation

GitHub Actions / Tests

Caution: `env` also has a named export `get`. Check if you meant to write `import {get} from 'env-var'` instead
env: environement,
publicUrl,
apiPublicUrl: environement === "local" ? "http://localhost:5001/api" : `${publicUrl}/api`,
log: {
type: env.get("LOG_TYPE").asString(),

Check warning on line 23 in server/src/config.ts

View workflow job for this annotation

GitHub Actions / Tests

Caution: `env` also has a named export `get`. Check if you meant to write `import {get} from 'env-var'` instead
level: env.get("LOG_LEVEL").required().asString(),

Check warning on line 24 in server/src/config.ts

View workflow job for this annotation

GitHub Actions / Tests

Caution: `env` also has a named export `get`. Check if you meant to write `import {get} from 'env-var'` instead
forceLocalLogs: env.get("LOG_LOCAL").asBool(),

Check warning on line 25 in server/src/config.ts

View workflow job for this annotation

GitHub Actions / Tests

Caution: `env` also has a named export `get`. Check if you meant to write `import {get} from 'env-var'` instead
},
psql: {
host: env.get("PSQL_HOST").required().asString(),

Check warning on line 28 in server/src/config.ts

View workflow job for this annotation

GitHub Actions / Tests

Caution: `env` also has a named export `get`. Check if you meant to write `import {get} from 'env-var'` instead
port: env.get("PSQL_PORT").required().asPortNumber(),

Check warning on line 29 in server/src/config.ts

View workflow job for this annotation

GitHub Actions / Tests

Caution: `env` also has a named export `get`. Check if you meant to write `import {get} from 'env-var'` instead
user: env.get("PQSL_USER").required().asString(),
password: env.get("PSQL_PWD").required().asString(),
uri: env.get("PSQL_URI").required().asString(),
Expand Down
3 changes: 2 additions & 1 deletion server/src/db/db.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Kysely, PostgresDialect } from "kysely";
import * as pg from "pg";
/* eslint-disable-next-line import/default */
import pg from "pg";
const { Pool, types } = pg;

import config from "@/config";
Expand Down
6 changes: 4 additions & 2 deletions server/src/modules/core/services/mailer/mailer.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import * as ejs from "ejs";
/* eslint-disable-next-line import/default */
import ejs from "ejs";
// eslint-disable-next-line import/no-extraneous-dependencies, n/no-extraneous-import
import { inject } from "injecti";
import { omit } from "lodash-es";
import mjml from "mjml";
import * as nodemailer from "nodemailer";
/* eslint-disable-next-line import/default */
import nodemailer from "nodemailer";
import type SMTPTransport from "nodemailer/lib/smtp-transport";
import { htmlToText } from "nodemailer-html-to-text";
import path from "path";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import * as jwt from "jsonwebtoken";
/* eslint-disable-next-line import/default */
import jwt from "jsonwebtoken";
import { describe, expect, it, vi } from "vitest";

import { activateUserFactory } from "./activateUser.usecase";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import * as Boom from "@hapi/boom";
// eslint-disable-next-line import/no-extraneous-dependencies, n/no-extraneous-import
import { inject } from "injecti";
import * as jwt from "jsonwebtoken";
/* eslint-disable-next-line import/default */
import jwt from "jsonwebtoken";
import { passwordRegex } from "shared/utils/passwordRegex";

import config from "@/config";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import * as jwt from "jsonwebtoken";
/* eslint-disable-next-line import/default */
import jwt from "jsonwebtoken";
import { describe, expect, it } from "vitest";

import { checkActivationTokenFactory } from "./checkActivationToken.usecase";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import * as Boom from "@hapi/boom";
// eslint-disable-next-line import/no-extraneous-dependencies, n/no-extraneous-import
import { inject } from "injecti";
import * as jwt from "jsonwebtoken";
/* eslint-disable-next-line import/default */
import jwt from "jsonwebtoken";

import config from "@/config";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import * as Boom from "@hapi/boom";
// eslint-disable-next-line import/no-extraneous-dependencies, n/no-extraneous-import
import { inject } from "injecti";
import * as jwt from "jsonwebtoken";
/* eslint-disable-next-line import/default */
import jwt from "jsonwebtoken";
import { emailRegex } from "shared";
import type { BodySchema } from "shared/routes/schemas/post.users.userId.schema";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// eslint-disable-next-line import/no-extraneous-dependencies, n/no-extraneous-import
import { inject } from "injecti";
import * as jwt from "jsonwebtoken";
/* eslint-disable-next-line import/default */
import jwt from "jsonwebtoken";

import config from "@/config";
import { getDneClient } from "@/modules/core/services/dneClient/dneClient";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// eslint-disable-next-line import/no-extraneous-dependencies, n/no-extraneous-import
import { inject } from "injecti";
import * as jwt from "jsonwebtoken";
/* eslint-disable-next-line import/default */
import jwt from "jsonwebtoken";
import { generators } from "openid-client";

import config from "@/config";
Expand Down
3 changes: 2 additions & 1 deletion server/src/modules/core/usecases/login/login.usecase.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import * as Boom from "@hapi/boom";
// eslint-disable-next-line import/no-extraneous-dependencies, n/no-extraneous-import
import { inject } from "injecti";
import * as jwt from "jsonwebtoken";
/* eslint-disable-next-line import/default */
import jwt from "jsonwebtoken";

import config from "@/config";
import { verifyPassword } from "@/modules/core/utils/passwordUtils";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import * as jwt from "jsonwebtoken";
/* eslint-disable-next-line import/default */
import jwt from "jsonwebtoken";
import { describe, expect, it, vi } from "vitest";

import { redirectDneFactory } from "./redirectDne.usecase";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ import dayjs from "dayjs";
import customParseFormat from "dayjs/plugin/customParseFormat.js";
// eslint-disable-next-line import/no-extraneous-dependencies, n/no-extraneous-import
import { inject } from "injecti";
import * as jwt from "jsonwebtoken";
/* eslint-disable-next-line import/default */
import jwt from "jsonwebtoken";
import { flatten, uniq } from "lodash-es";
import type { UserinfoResponse } from "openid-client";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import * as jwt from "jsonwebtoken";
/* eslint-disable-next-line import/default */
import jwt from "jsonwebtoken";
import { describe, expect, it, vi } from "vitest";

import { resetPasswordFactory } from "./resetPassword.usecase";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import * as Boom from "@hapi/boom";
// eslint-disable-next-line import/no-extraneous-dependencies, n/no-extraneous-import
import { inject } from "injecti";
import * as jwt from "jsonwebtoken";
/* eslint-disable-next-line import/default */
import jwt from "jsonwebtoken";
import { passwordRegex } from "shared/utils/passwordRegex";

import config from "@/config";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import * as Boom from "@hapi/boom";
// eslint-disable-next-line import/no-extraneous-dependencies, n/no-extraneous-import
import { inject } from "injecti";
import * as jwt from "jsonwebtoken";
/* eslint-disable-next-line import/default */
import jwt from "jsonwebtoken";

import config from "@/config";
import { shootTemplate } from "@/modules/core/services/mailer/mailer";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import type { FastifyRequest } from "fastify";
import * as jwt from "jsonwebtoken";
/* eslint-disable-next-line import/default */
import jwt from "jsonwebtoken";
import { describe, expect, it } from "vitest";

import { extractUserInRequestFactory } from "./extractUserInRequest";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ import * as Sentry from "@sentry/node";
import type { FastifyRequest } from "fastify";
// eslint-disable-next-line import/no-extraneous-dependencies, n/no-extraneous-import
import { inject } from "injecti";
import * as jwt from "jsonwebtoken";
/* eslint-disable-next-line import/default */
import jwt from "jsonwebtoken";

import config from "@/config";
import type { RequestUser } from "@/modules/core/model/User";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,8 @@ export const getFormationsQuery = async ({
.execute()
.then(cleanNull);

console.log(result);

return {
count: result[0]?.count ?? 0,
formations: result.map((formation) => ({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ const getFormationsFactory =
}
) =>
async (activeFilters: Partial<Filters>) => {
console.log(activeFilters);
const [{ formations, count }, filters, formationsRenoveesEnseignees] = await Promise.all([
deps.getFormationsQuery(activeFilters),
deps.getFiltersQuery(activeFilters),
Expand Down
6 changes: 3 additions & 3 deletions server/src/modules/utils/generateId.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as uuid from "uuid";
import { v4 as uuidv4 } from "uuid";

export const generateId = () => uuid.v4().replace(/-/g, "");
export const generateId = () => uuidv4().replace(/-/g, "");

export const generateShortId = () => uuid.v4().replace(/-/g, "").slice(0, 8).toUpperCase();
export const generateShortId = () => uuidv4().replace(/-/g, "").slice(0, 8).toUpperCase();
3 changes: 2 additions & 1 deletion server/src/server/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ import type {
import { fastify } from "fastify";
import type { ZodTypeProvider } from "fastify-type-provider-zod";
import { jsonSchemaTransform, serializerCompiler, validatorCompiler } from "fastify-type-provider-zod";
import * as qs from "qs";
/* eslint-disable-next-line import/default */
import qs from "qs";
import { MAX_FILE_SIZE } from "shared";

import config from "@/config";
Expand Down
3 changes: 2 additions & 1 deletion server/src/utils/pgtools.utils.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import type * as Ipg from "pg";
import * as pg from "pg";
/* eslint-disable-next-line import/default */
import pg from "pg";
import type { EmptyObject } from "type-fest";

const { Client } = pg;
Expand Down
3 changes: 2 additions & 1 deletion server/tests/utils/schema/users.spec.utils.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { faker } from "@faker-js/faker";
import * as jwt from "jsonwebtoken";
/* eslint-disable-next-line import/default */
import jwt from "jsonwebtoken";
import type { Insertable } from "kysely";
import type { Role } from "shared";

Expand Down
3 changes: 2 additions & 1 deletion ui/app/(wrapped)/console/etablissements/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ import { Icon } from "@iconify/react";
import _ from "lodash";
import { useRouter, useSearchParams } from "next/navigation";
import { usePlausible } from "next-plausible";
import * as qs from "qs";
/* eslint-disable-next-line import/default */
import qs from "qs";
import { useContext, useEffect, useState } from "react";
import { TypeFormationSpecifiqueEnum } from "shared/enum/formationSpecifiqueEnum";

Expand Down
3 changes: 2 additions & 1 deletion ui/app/(wrapped)/console/formations/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ import { Icon } from "@iconify/react";
import _ from "lodash";
import { useRouter, useSearchParams } from "next/navigation";
import { usePlausible } from "next-plausible";
import * as qs from "qs";
/* eslint-disable-next-line import/default */
import qs from "qs";
import { useContext, useEffect, useState } from "react";
import { TypeFormationSpecifiqueEnum } from "shared/enum/formationSpecifiqueEnum";
import type { OptionSchema } from "shared/schema/optionSchema";
Expand Down
3 changes: 2 additions & 1 deletion ui/app/(wrapped)/intentions/corrections/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ import {Button, chakra, Container, Flex, MenuButton} from '@chakra-ui/react';
import { Icon } from "@iconify/react";
import { useRouter, useSearchParams } from "next/navigation";
import { usePlausible } from "next-plausible";
import * as qs from "qs";
/* eslint-disable-next-line import/default */
import qs from "qs";
import { useContext, useEffect, useState } from "react";
import { PREVIOUS_ANNEE_CAMPAGNE } from "shared/time/PREVIOUS_ANNEE_CAMPAGNE";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
import { Container, Flex, Grid, GridItem } from "@chakra-ui/react";
import { isAxiosError } from "axios";
import { useRouter, useSearchParams } from "next/navigation";
import * as qs from "qs";
/* eslint-disable-next-line import/default */
import qs from "qs";
import { useEffect } from "react";
import { hasRole } from "shared";
import { CampagneStatutEnum } from "shared/enum/campagneStatutEnum";
Expand Down
3 changes: 2 additions & 1 deletion ui/app/(wrapped)/intentions/restitution/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ import { Icon } from "@iconify/react";
import _ from "lodash";
import { useRouter, useSearchParams } from "next/navigation";
import { usePlausible } from "next-plausible";
import * as qs from "qs";
/* eslint-disable-next-line import/default */
import qs from "qs";
import { useContext, useEffect, useState } from "react";
import type { DemandeStatutType } from "shared/enum/demandeStatutEnum";
import { DemandeStatutEnum } from "shared/enum/demandeStatutEnum";
Expand Down
3 changes: 2 additions & 1 deletion ui/app/(wrapped)/panorama/departement/PanoramaSelection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

import { AspectRatio, Container, Flex, FormControl, FormLabel, Img, Select } from "@chakra-ui/react";
import { useRouter } from "next/navigation";
import * as qs from "qs";
/* eslint-disable-next-line import/default */
import qs from "qs";
import { useContext, useEffect } from "react";

import type { client } from "@/api.client";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
"use client";

import { useRouter, useSearchParams } from "next/navigation";
import * as qs from "qs";
/* eslint-disable-next-line import/default */
import qs from "qs";
import { useContext } from "react";

import { client } from "@/api.client";
Expand Down
3 changes: 2 additions & 1 deletion ui/app/(wrapped)/panorama/region/PanoramaSelection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

import { AspectRatio, Container, Flex, FormControl, FormLabel, Img, Select } from "@chakra-ui/react";
import { useRouter } from "next/navigation";
import * as qs from "qs";
/* eslint-disable-next-line import/default */
import qs from "qs";
import { useContext, useEffect } from "react";

import type { client } from "@/api.client";
Expand Down
3 changes: 2 additions & 1 deletion ui/app/(wrapped)/panorama/region/[codeRegion]/page.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
"use client";

import { useRouter, useSearchParams } from "next/navigation";
import * as qs from "qs";
/* eslint-disable-next-line import/default */
import qs from "qs";
import { useContext } from "react";

import { client } from "@/api.client";
Expand Down
3 changes: 2 additions & 1 deletion ui/app/(wrapped)/pilotage-reforme/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
import { Box, Container, Flex, SimpleGrid } from "@chakra-ui/react";
import { useRouter, useSearchParams } from "next/navigation";
import { usePlausible } from "next-plausible";
import * as qs from "qs";
/* eslint-disable-next-line import/default */
import qs from "qs";
import { useState } from "react";

import { client } from "@/api.client";
Expand Down
3 changes: 2 additions & 1 deletion ui/utils/createParameterizedUrl.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import * as qs from "qs";
/* eslint-disable-next-line import/default */
import qs from "qs";

export const createParameterizedUrl = (pathname: string, searchParams: object) => {
return (
Expand Down
4 changes: 2 additions & 2 deletions ui/utils/downloadExport.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { number as numberFormatter } from "@json2csv/formatters";
import { Parser } from "@json2csv/plainjs";
// eslint-disable-next-line import/no-extraneous-dependencies
import * as Excel from "exceljs";
// eslint-disable-next-line import/no-extraneous-dependencies, import/default
import Excel from "exceljs";
// eslint-disable-next-line import/no-extraneous-dependencies
import { saveAs } from "file-saver";
import _ from "lodash";
Expand Down
3 changes: 2 additions & 1 deletion ui/utils/useFilters.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { useRouter, useSearchParams } from "next/navigation";
import * as qs from "qs";
/* eslint-disable-next-line import/default */
import qs from "qs";
import type { SetStateAction } from "react";
import { useEffect, useState } from "react";

Expand Down