parent
861f81f14e
commit
3030b21f18
4 changed files with 8 additions and 54 deletions
|
|
@ -2,7 +2,7 @@ import { arktypeResolver } from "@hookform/resolvers/arktype";
|
||||||
import { type } from "arktype";
|
import { type } from "arktype";
|
||||||
import { useEffect } from "react";
|
import { useEffect } from "react";
|
||||||
import { useForm } from "react-hook-form";
|
import { useForm } from "react-hook-form";
|
||||||
import { cn, slugify } from "~/client/lib/utils";
|
import { cn } from "~/client/lib/utils";
|
||||||
import { deepClean } from "~/utils/object";
|
import { deepClean } from "~/utils/object";
|
||||||
import {
|
import {
|
||||||
Form,
|
Form,
|
||||||
|
|
@ -141,7 +141,6 @@ export const CreateNotificationForm = ({ onSubmit, mode = "create", initialValue
|
||||||
<Input
|
<Input
|
||||||
{...field}
|
{...field}
|
||||||
placeholder="My notification"
|
placeholder="My notification"
|
||||||
onChange={(e) => field.onChange(slugify(e.target.value))}
|
|
||||||
max={32}
|
max={32}
|
||||||
min={2}
|
min={2}
|
||||||
/>
|
/>
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@ import { type } from "arktype";
|
||||||
import { CheckCircle, Loader2, Plug, Save, XCircle } from "lucide-react";
|
import { CheckCircle, Loader2, Plug, Save, XCircle } from "lucide-react";
|
||||||
import { useEffect, useState } from "react";
|
import { useEffect, useState } from "react";
|
||||||
import { useForm } from "react-hook-form";
|
import { useForm } from "react-hook-form";
|
||||||
import { cn, slugify } from "~/client/lib/utils";
|
import { cn } from "~/client/lib/utils";
|
||||||
import { deepClean } from "~/utils/object";
|
import { deepClean } from "~/utils/object";
|
||||||
import { Button } from "../../../components/ui/button";
|
import { Button } from "../../../components/ui/button";
|
||||||
import {
|
import {
|
||||||
|
|
@ -122,7 +122,6 @@ export const CreateVolumeForm = ({ onSubmit, mode = "create", initialValues, for
|
||||||
<Input
|
<Input
|
||||||
{...field}
|
{...field}
|
||||||
placeholder="Volume name"
|
placeholder="Volume name"
|
||||||
onChange={(e) => field.onChange(slugify(e.target.value))}
|
|
||||||
maxLength={32}
|
maxLength={32}
|
||||||
minLength={2}
|
minLength={2}
|
||||||
/>
|
/>
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
import { eq, and, ne, inArray } from "drizzle-orm";
|
import { eq, and, ne, inArray } from "drizzle-orm";
|
||||||
import { ConflictError, InternalServerError, NotFoundError } from "http-errors-enhanced";
|
import { ConflictError, InternalServerError, NotFoundError } from "http-errors-enhanced";
|
||||||
import slugify from "slugify";
|
|
||||||
import { db } from "../../db/db";
|
import { db } from "../../db/db";
|
||||||
import {
|
import {
|
||||||
notificationDestinationsTable,
|
notificationDestinationsTable,
|
||||||
|
|
@ -139,22 +138,14 @@ async function decryptSensitiveFields(config: NotificationConfig): Promise<Notif
|
||||||
|
|
||||||
const createDestination = async (name: string, config: NotificationConfig) => {
|
const createDestination = async (name: string, config: NotificationConfig) => {
|
||||||
const organizationId = getOrganizationId();
|
const organizationId = getOrganizationId();
|
||||||
const slug = slugify(name, { lower: true, strict: true });
|
const trimmedName = name.trim();
|
||||||
|
|
||||||
const existing = await db.query.notificationDestinationsTable.findFirst({
|
|
||||||
where: and(eq(notificationDestinationsTable.name, slug), eq(notificationDestinationsTable.organizationId, organizationId)),
|
|
||||||
});
|
|
||||||
|
|
||||||
if (existing) {
|
|
||||||
throw new ConflictError("Notification destination with this name already exists");
|
|
||||||
}
|
|
||||||
|
|
||||||
const encryptedConfig = await encryptSensitiveFields(config);
|
const encryptedConfig = await encryptSensitiveFields(config);
|
||||||
|
|
||||||
const [created] = await db
|
const [created] = await db
|
||||||
.insert(notificationDestinationsTable)
|
.insert(notificationDestinationsTable)
|
||||||
.values({
|
.values({
|
||||||
name: slug,
|
name: trimmedName,
|
||||||
type: config.type,
|
type: config.type,
|
||||||
config: encryptedConfig,
|
config: encryptedConfig,
|
||||||
organizationId,
|
organizationId,
|
||||||
|
|
@ -184,16 +175,7 @@ const updateDestination = async (
|
||||||
};
|
};
|
||||||
|
|
||||||
if (updates.name !== undefined) {
|
if (updates.name !== undefined) {
|
||||||
const slug = slugify(updates.name, { lower: true, strict: true });
|
updateData.name = updates.name.trim();
|
||||||
|
|
||||||
const conflict = await db.query.notificationDestinationsTable.findFirst({
|
|
||||||
where: and(eq(notificationDestinationsTable.name, slug), ne(notificationDestinationsTable.id, id), eq(notificationDestinationsTable.organizationId, organizationId)),
|
|
||||||
});
|
|
||||||
|
|
||||||
if (conflict) {
|
|
||||||
throw new ConflictError("Notification destination with this name already exists");
|
|
||||||
}
|
|
||||||
updateData.name = slug;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (updates.enabled !== undefined) {
|
if (updates.enabled !== undefined) {
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@ import * as os from "node:os";
|
||||||
import * as path from "node:path";
|
import * as path from "node:path";
|
||||||
import { and, eq, ne } from "drizzle-orm";
|
import { and, eq, ne } from "drizzle-orm";
|
||||||
import { ConflictError, InternalServerError, NotFoundError } from "http-errors-enhanced";
|
import { ConflictError, InternalServerError, NotFoundError } from "http-errors-enhanced";
|
||||||
import slugify from "slugify";
|
|
||||||
import { db } from "../../db/db";
|
import { db } from "../../db/db";
|
||||||
import { volumesTable } from "../../db/schema";
|
import { volumesTable } from "../../db/schema";
|
||||||
import { cryptoUtils } from "../../utils/crypto";
|
import { cryptoUtils } from "../../utils/crypto";
|
||||||
|
|
@ -65,15 +64,7 @@ const findVolume = async (idOrShortId: string | number) => {
|
||||||
|
|
||||||
const createVolume = async (name: string, backendConfig: BackendConfig) => {
|
const createVolume = async (name: string, backendConfig: BackendConfig) => {
|
||||||
const organizationId = getOrganizationId();
|
const organizationId = getOrganizationId();
|
||||||
const slug = slugify(name, { lower: true, strict: true });
|
const trimmedName = name.trim();
|
||||||
|
|
||||||
const existing = await db.query.volumesTable.findFirst({
|
|
||||||
where: and(eq(volumesTable.name, slug), eq(volumesTable.organizationId, organizationId)),
|
|
||||||
});
|
|
||||||
|
|
||||||
if (existing) {
|
|
||||||
throw new ConflictError("Volume already exists");
|
|
||||||
}
|
|
||||||
|
|
||||||
const shortId = generateShortId();
|
const shortId = generateShortId();
|
||||||
const encryptedConfig = await encryptSensitiveFields(backendConfig);
|
const encryptedConfig = await encryptSensitiveFields(backendConfig);
|
||||||
|
|
@ -82,7 +73,7 @@ const createVolume = async (name: string, backendConfig: BackendConfig) => {
|
||||||
.insert(volumesTable)
|
.insert(volumesTable)
|
||||||
.values({
|
.values({
|
||||||
shortId,
|
shortId,
|
||||||
name: slug,
|
name: trimmedName,
|
||||||
config: encryptedConfig,
|
config: encryptedConfig,
|
||||||
type: backendConfig.backend,
|
type: backendConfig.backend,
|
||||||
organizationId,
|
organizationId,
|
||||||
|
|
@ -191,24 +182,7 @@ const updateVolume = async (idOrShortId: string | number, volumeData: UpdateVolu
|
||||||
throw new NotFoundError("Volume not found");
|
throw new NotFoundError("Volume not found");
|
||||||
}
|
}
|
||||||
|
|
||||||
let newName = existing.name;
|
const newName = volumeData.name !== undefined ? volumeData.name.trim() : existing.name;
|
||||||
if (volumeData.name !== undefined && volumeData.name !== existing.name) {
|
|
||||||
const newSlug = slugify(volumeData.name, { lower: true, strict: true });
|
|
||||||
|
|
||||||
const conflict = await db.query.volumesTable.findFirst({
|
|
||||||
where: and(
|
|
||||||
eq(volumesTable.name, newSlug),
|
|
||||||
ne(volumesTable.id, existing.id),
|
|
||||||
eq(volumesTable.organizationId, organizationId),
|
|
||||||
),
|
|
||||||
});
|
|
||||||
|
|
||||||
if (conflict) {
|
|
||||||
throw new ConflictError("A volume with this name already exists");
|
|
||||||
}
|
|
||||||
|
|
||||||
newName = newSlug;
|
|
||||||
}
|
|
||||||
|
|
||||||
const configChanged =
|
const configChanged =
|
||||||
JSON.stringify(existing.config) !== JSON.stringify(volumeData.config) && volumeData.config !== undefined;
|
JSON.stringify(existing.config) !== JSON.stringify(volumeData.config) && volumeData.config !== undefined;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue