tea/browsertrix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

standarize slugify

Browse Source
This commit is contained in:
sua yoo 2024-07-15 12:06:43 -07:00
parent bafc96ac94
commit a234a36057
No known key found for this signature in database
GPG Key ID: 5AD1B4C02D4F0567
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/src/pages/invite/ui/org-form.ts
View File

@ -4,7 +4,6 @@ import type { SlInput } from "@shoelace-style/shoelace";
import { serialize } from "@shoelace-style/shoelace/dist/utilities/form.js"; import { serialize } from "@shoelace-style/shoelace/dist/utilities/form.js";
import { html } from "lit"; import { html } from "lit";
import { customElement, property, query } from "lit/decorators.js"; import { customElement, property, query } from "lit/decorators.js";
import slugify from "slugify";
import { TailwindElement } from "@/classes/TailwindElement"; import { TailwindElement } from "@/classes/TailwindElement";
import { APIController } from "@/controllers/api"; import { APIController } from "@/controllers/api";
@ -13,6 +12,7 @@ import { type APIUser } from "@/index";
import { isApiError } from "@/utils/api"; import { isApiError } from "@/utils/api";
import type { AuthState } from "@/utils/AuthService"; import type { AuthState } from "@/utils/AuthService";
import { maxLengthValidator } from "@/utils/form"; import { maxLengthValidator } from "@/utils/form";
import slugifyStrict from "@/utils/slugify";
import { AppStateService } from "@/utils/state"; import { AppStateService } from "@/utils/state";
import { formatAPIUser } from "@/utils/user"; import { formatAPIUser } from "@/utils/user";
@ -96,7 +96,7 @@ export class OrgForm extends TailwindElement {
required required
@sl-input=${(e: InputEvent) => { @sl-input=${(e: InputEvent) => {
const input = e.target as SlInput; const input = e.target as SlInput;
input.helpText = helpText(slugify(input.value, { strict: true })); input.helpText = helpText(slugifyStrict(input.value));
}} }}
> >
</sl-input> </sl-input>
@ -129,7 +129,7 @@ export class OrgForm extends TailwindElement {
const params = serialize(form) as FormValues; const params = serialize(form) as FormValues;
const orgName = params.orgName; const orgName = params.orgName;
const orgSlug = slugify(params.orgSlug, { strict: true }); const orgSlug = slugifyStrict(params.orgSlug);
void this._renameOrgTask.run([this.orgId, orgName, orgSlug]); void this._renameOrgTask.run([this.orgId, orgName, orgSlug]);
} }

12
frontend/src/pages/org/settings/settings.ts
View File

@ -5,7 +5,6 @@ import { html, type PropertyValues } from "lit";
import { customElement, property, state } from "lit/decorators.js"; import { customElement, property, state } from "lit/decorators.js";
import { ifDefined } from "lit/directives/if-defined.js"; import { ifDefined } from "lit/directives/if-defined.js";
import { when } from "lit/directives/when.js"; import { when } from "lit/directives/when.js";
import slugify from "slugify";
import { columns } from "./ui/columns"; import { columns } from "./ui/columns";
@ -20,6 +19,7 @@ import { isApiError } from "@/utils/api";
import type { AuthState } from "@/utils/AuthService"; import type { AuthState } from "@/utils/AuthService";
import { maxLengthValidator } from "@/utils/form"; import { maxLengthValidator } from "@/utils/form";
import { AccessCode, isAdmin, isCrawler, type OrgData } from "@/utils/orgs"; import { AccessCode, isAdmin, isCrawler, type OrgData } from "@/utils/orgs";
import slugifyStrict from "@/utils/slugify";
import appState, { AppStateService, use } from "@/utils/state"; import appState, { AppStateService, use } from "@/utils/state";
import { formatAPIUser } from "@/utils/user"; import { formatAPIUser } from "@/utils/user";
@ -233,7 +233,7 @@ export class OrgSettings extends TailwindElement {
window.location.hostname window.location.hostname
}/orgs/${ }/orgs/${
this.slugValue this.slugValue
? this.slugify(this.slugValue) ? slugifyStrict(this.slugValue)
: this.org.slug : this.org.slug
}`, }`,
)} )}
@ -454,12 +454,6 @@ export class OrgSettings extends TailwindElement {
`; `;
} }
private slugify(value: string) {
return slugify(value, {
strict: true,
});
}
private async checkFormValidity(formEl: HTMLFormElement) { private async checkFormValidity(formEl: HTMLFormElement) {
await this.updateComplete; await this.updateComplete;
return !formEl.querySelector("[data-invalid]"); return !formEl.querySelector("[data-invalid]");
@ -502,7 +496,7 @@ export class OrgSettings extends TailwindElement {
}; };
if (this.slugValue) { if (this.slugValue) {
params.slug = this.slugify(this.slugValue); params.slug = slugifyStrict(this.slugValue);
} }
this.isSavingOrgName = true; this.isSavingOrgName = true;