awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-09-22 13:39:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix lint errors

Browse Source
This commit is contained in:
Tuan Dang
2023-07-26 15:06:18 +07:00
parent cf77820059
commit bf08bfacb5
18 changed files with 41 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/ee/controllers/v1/workspaceController.ts
View File

@@ -1,5 +1,5 @@
import { Request, Response } from "express";
import { PipelineStage, trusted, Types } from "mongoose";
import { PipelineStage, Types } from "mongoose";
import { Secret } from "../../../models";
import {
FolderVersion,
@@ -15,7 +15,7 @@ import { getLatestSecretVersionIds } from "../../helpers/secretVersion";
import Folder, { TFolderSchema } from "../../../models/folder";
import { searchByFolderId } from "../../../services/FolderService";
import { EELicenseService } from "../../services";
import { isValidIpOrCidr, extractIPDetails } from "../../../utils/ip";
import { extractIPDetails, isValidIpOrCidr } from "../../../utils/ip";
/**
* Return secret snapshots for workspace with id [workspaceId]

2
backend/src/ee/routes/v1/users.ts
View File

@@ -3,7 +3,7 @@ const router = express.Router();
import {
requireAuth
} from "../../../middleware";
import { AUTH_MODE_JWT, AUTH_MODE_API_KEY } from "../../../variables";
import { AUTH_MODE_API_KEY, AUTH_MODE_JWT } from "../../../variables";
import { usersController } from "../../controllers/v1";
router.get(

2
backend/src/utils/ip/ip.ts
View File

@@ -88,7 +88,7 @@ export const isValidCidr = (cidr: string): boolean => {
*/
export const isValidIpOrCidr = (ip: string): boolean => {
// if the string contains a slash, treat it as a CIDR block
if (ip.includes('/')) {
if (ip.includes("/")) {
return isValidCidr(ip);
}

6
backend/src/utils/setup/backfillData.ts
View File

@@ -4,11 +4,11 @@ import { Types } from "mongoose";
import { encryptSymmetric128BitHexKeyUTF8 } from "../crypto";
import { EESecretService } from "../../ee/services";
import {
IPType,
ISecretVersion,
SecretSnapshot,
SecretSnapshot,
SecretVersion,
TrustedIP,
IPType
TrustedIP
} from "../../ee/models";
import {
BackupPrivateKey,

2
frontend/src/hooks/api/index.tsx
View File

@@ -14,7 +14,7 @@ export * from "./serviceTokens";
export * from "./ssoConfig";
export * from "./subscriptions";
export * from "./tags";
export * from "./trustedIps";
export * from "./users";
export * from "./webhooks";
export * from "./workspace";
export * from "./trustedIps";

1
frontend/src/hooks/api/organization/queries.tsx
View File

@@ -1,4 +1,5 @@
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
import { apiRequest } from "@app/config/request";
import {

7
frontend/src/hooks/api/trustedIps/index.ts
View File

@@ -1,6 +1,5 @@
export {
useGetTrustedIps,
useAddTrustedIp,
useUpdateTrustedIp,
useDeleteTrustedIp
} from "./queries";
useDeleteTrustedIp,
useGetTrustedIps,
useUpdateTrustedIp} from "./queries";

2
frontend/src/hooks/api/trustedIps/queries.ts
View File

@@ -1,5 +1,7 @@
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
import { apiRequest } from "@app/config/request";
import {
TrustedIp
} from "./types";

2
frontend/src/hooks/api/users/index.tsx
View File

@@ -5,8 +5,8 @@ export {
useCreateAPIKey,
useDeleteAPIKey,
useDeleteOrgMembership,
useGetMyIp,
useGetMyAPIKeys,
useGetMyIp,
useGetMySessions,
useGetOrgUsers,
useGetUser,

1
frontend/src/pages/project/[id]/allowlist/index.tsx
View File

@@ -1,5 +1,6 @@
import { useTranslation } from "react-i18next";
import Head from "next/head";
import { IPAllowlistPage } from "@app/views/Project/IPAllowListPage";
const ProjectAllowlist = () => {

5
frontend/src/views/Project/IPAllowListPage/components/IPAllowlistModal.tsx
View File

@@ -2,6 +2,7 @@ import { useEffect } from "react";
import { Controller, useForm } from "react-hook-form";
import { yupResolver } from "@hookform/resolvers/yup";
import * as yup from "yup";
import { useNotificationContext } from "@app/components/context/Notifications/NotificationProvider";
import {
Button,
@@ -10,13 +11,13 @@ import {
Modal,
ModalContent
} from "@app/components/v2";
import { UsePopUpState } from "@app/hooks/usePopUp";
import { useWorkspace } from "@app/context";
import {
useGetMyIp,
useAddTrustedIp,
useGetMyIp,
useUpdateTrustedIp
} from "@app/hooks/api";
import { UsePopUpState } from "@app/hooks/usePopUp";
const schema = yup.object({
ipAddress: yup.string().required("IP address is required"),

8
frontend/src/views/Project/IPAllowListPage/components/IPAllowlistSection.tsx
View File

@@ -1,18 +1,20 @@
import { useNotificationContext } from "@app/components/context/Notifications/NotificationProvider";
import { faPlus } from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { useNotificationContext } from "@app/components/context/Notifications/NotificationProvider";
import {
Button,
DeleteActionModal,
UpgradePlanModal
} from "@app/components/v2";
import { useSubscription,useWorkspace } from "@app/context";
import {
useDeleteTrustedIp
} from "@app/hooks/api";
import { useSubscription,useWorkspace } from "@app/context";
import { usePopUp } from "@app/hooks/usePopUp";
import { IPAllowlistTable } from "./IPAllowlistTable";
import { IPAllowlistModal } from "./IPAllowlistModal";
import { IPAllowlistTable } from "./IPAllowlistTable";
export const IPAllowlistSection = () => {
const { createNotification } = useNotificationContext();

21
frontend/src/views/Project/IPAllowListPage/components/IPAllowlistTable.tsx
View File

@@ -1,22 +1,23 @@
import { faGlobe, faPencil, faXmark } from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import {
TableContainer,
EmptyState,
IconButton,
Table,
THead,
Tr,
Th,
TableContainer,
TableSkeleton,
TBody,
Td,
EmptyState,
TableSkeleton,
IconButton,
Th,
THead,
Tr,
UpgradePlanModal
} from "@app/components/v2";
import { useSubscription, useWorkspace } from "@app/context";
import {
useGetTrustedIps
} from "@app/hooks/api";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faGlobe, faPencil, faXmark } from "@fortawesome/free-solid-svg-icons";
import { UsePopUpState } from "@app/hooks/usePopUp";
type Props = {
@@ -56,7 +57,7 @@ export const IPAllowlistTable = ({
<Th className="flex-1">Format</Th>
<Th className="flex-1">Comment</Th>
{/* <Th className="flex-1">Status</Th> */}
<Th className="w-5"></Th>
<Th className="w-5" />
</Tr>
</THead>
<TBody>

1
frontend/src/views/Settings/BillingSettingsPage/components/BillingDetailsTab/PmtMethodsSection.tsx
View File

@@ -1,6 +1,7 @@
import { faPlus } from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import {
Button
} from "@app/components/v2";

1
frontend/src/views/Settings/BillingSettingsPage/components/BillingDetailsTab/PmtMethodsTable.tsx
View File

@@ -1,5 +1,6 @@
import { faCreditCard, faXmark } from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import {
EmptyState,
IconButton,

1
frontend/src/views/Settings/BillingSettingsPage/components/BillingDetailsTab/TaxIDModal.tsx
View File

@@ -1,6 +1,7 @@
import { Controller, useForm } from "react-hook-form";
import { yupResolver } from "@hookform/resolvers/yup";
import * as yup from "yup";
import { useNotificationContext } from "@app/components/context/Notifications/NotificationProvider";
import {
Button,

1
frontend/src/views/Settings/BillingSettingsPage/components/BillingReceiptsTab/InvoicesTable.tsx
View File

@@ -1,5 +1,6 @@
import { faDownload, faFileInvoice } from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import {
EmptyState,
IconButton,

2
frontend/src/views/Settings/ProjectSettingsPage/components/EnvironmentSection/EnvironmentSection.tsx
View File

@@ -1,5 +1,6 @@
import { faPlus } from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { useNotificationContext } from "@app/components/context/Notifications/NotificationProvider";
import {
Button,
@@ -11,6 +12,7 @@ import {
useDeleteWsEnvironment
} from "@app/hooks/api";
import { usePopUp } from "@app/hooks/usePopUp";
import { AddEnvironmentModal } from "./AddEnvironmentModal";
import { EnvironmentTable } from "./EnvironmentTable";
import { UpdateEnvironmentModal } from "./UpdateEnvironmentModal";