diff --git a/app/javascript/packs/admin.jsx b/app/javascript/packs/admin.jsx
deleted file mode 100644
index 5f24d6677e..0000000000
--- a/app/javascript/packs/admin.jsx
+++ /dev/null
@@ -1,244 +0,0 @@
-import './public-path';
-import React from 'react';
-import { createRoot } from 'react-dom/client';
-
-import Rails from '@rails/ujs';
-
-import ready from '../mastodon/ready';
-
-const setAnnouncementEndsAttributes = (target) => {
- const valid = target?.value && target?.validity?.valid;
- const element = document.querySelector('input[type="datetime-local"]#announcement_ends_at');
- if (valid) {
- element.classList.remove('optional');
- element.required = true;
- element.min = target.value;
- } else {
- element.classList.add('optional');
- element.removeAttribute('required');
- element.removeAttribute('min');
- }
-};
-
-Rails.delegate(document, 'input[type="datetime-local"]#announcement_starts_at', 'change', ({ target }) => {
- setAnnouncementEndsAttributes(target);
-});
-
-const batchCheckboxClassName = '.batch-checkbox input[type="checkbox"]';
-
-const showSelectAll = () => {
- const selectAllMatchingElement = document.querySelector('.batch-table__select-all');
- selectAllMatchingElement.classList.add('active');
-};
-
-const hideSelectAll = () => {
- const selectAllMatchingElement = document.querySelector('.batch-table__select-all');
- const hiddenField = document.querySelector('#select_all_matching');
- const selectedMsg = document.querySelector('.batch-table__select-all .selected');
- const notSelectedMsg = document.querySelector('.batch-table__select-all .not-selected');
-
- selectAllMatchingElement.classList.remove('active');
- selectedMsg.classList.remove('active');
- notSelectedMsg.classList.add('active');
- hiddenField.value = '0';
-};
-
-Rails.delegate(document, '#batch_checkbox_all', 'change', ({ target }) => {
- const selectAllMatchingElement = document.querySelector('.batch-table__select-all');
-
- document.querySelectorAll(batchCheckboxClassName).forEach((content) => {
- content.checked = target.checked;
- });
-
- if (selectAllMatchingElement) {
- if (target.checked) {
- showSelectAll();
- } else {
- hideSelectAll();
- }
- }
-});
-
-Rails.delegate(document, '.batch-table__select-all button', 'click', () => {
- const hiddenField = document.querySelector('#select_all_matching');
- const active = hiddenField.value === '1';
- const selectedMsg = document.querySelector('.batch-table__select-all .selected');
- const notSelectedMsg = document.querySelector('.batch-table__select-all .not-selected');
-
- if (active) {
- hiddenField.value = '0';
- selectedMsg.classList.remove('active');
- notSelectedMsg.classList.add('active');
- } else {
- hiddenField.value = '1';
- notSelectedMsg.classList.remove('active');
- selectedMsg.classList.add('active');
- }
-});
-
-Rails.delegate(document, batchCheckboxClassName, 'change', () => {
- const checkAllElement = document.querySelector('#batch_checkbox_all');
- const selectAllMatchingElement = document.querySelector('.batch-table__select-all');
-
- if (checkAllElement) {
- const allCheckboxes = Array.from(
- document.querySelectorAll(batchCheckboxClassName)
- );
- checkAllElement.checked = allCheckboxes.every((content) => content.checked);
- checkAllElement.indeterminate = !checkAllElement.checked && allCheckboxes.some((content) => content.checked);
-
- if (selectAllMatchingElement) {
- if (checkAllElement.checked) {
- showSelectAll();
- } else {
- hideSelectAll();
- }
- }
- }
-});
-
-Rails.delegate(document, '.filter-subset--with-select select', 'change', ({ target }) => {
- target.form.submit();
-});
-
-const onDomainBlockSeverityChange = (target) => {
- const rejectMediaDiv = document.querySelector('.input.with_label.domain_block_reject_media');
- const rejectReportsDiv = document.querySelector('.input.with_label.domain_block_reject_reports');
-
- if (rejectMediaDiv) {
- rejectMediaDiv.style.display = (target.value === 'suspend') ? 'none' : 'block';
- }
-
- if (rejectReportsDiv) {
- rejectReportsDiv.style.display = (target.value === 'suspend') ? 'none' : 'block';
- }
-};
-
-Rails.delegate(document, '#domain_block_severity', 'change', ({ target }) => onDomainBlockSeverityChange(target));
-
-const onEnableBootstrapTimelineAccountsChange = (target) => {
- const bootstrapTimelineAccountsField = document.querySelector('#form_admin_settings_bootstrap_timeline_accounts');
-
- if (bootstrapTimelineAccountsField) {
- bootstrapTimelineAccountsField.disabled = !target.checked;
- if (target.checked) {
- bootstrapTimelineAccountsField.parentElement.classList.remove('disabled');
- bootstrapTimelineAccountsField.parentElement.parentElement.classList.remove('disabled');
- } else {
- bootstrapTimelineAccountsField.parentElement.classList.add('disabled');
- bootstrapTimelineAccountsField.parentElement.parentElement.classList.add('disabled');
- }
- }
-};
-
-Rails.delegate(document, '#form_admin_settings_enable_bootstrap_timeline_accounts', 'change', ({ target }) => onEnableBootstrapTimelineAccountsChange(target));
-
-const onChangeRegistrationMode = (target) => {
- const enabled = target.value === 'approved';
-
- document.querySelectorAll('.form_admin_settings_registrations_mode .warning-hint').forEach((warning_hint) => {
- warning_hint.style.display = target.value === 'open' ? 'inline' : 'none';
- });
-
- document.querySelectorAll('#form_admin_settings_require_invite_text').forEach((input) => {
- input.disabled = !enabled;
- if (enabled) {
- let element = input;
- do {
- element.classList.remove('disabled');
- element = element.parentElement;
- } while (element && !element.classList.contains('fields-group'));
- } else {
- let element = input;
- do {
- element.classList.add('disabled');
- element = element.parentElement;
- } while (element && !element.classList.contains('fields-group'));
- }
- });
-};
-
-const convertUTCDateTimeToLocal = (value) => {
- const date = new Date(value + 'Z');
- const twoChars = (x) => (x.toString().padStart(2, '0'));
- return `${date.getFullYear()}-${twoChars(date.getMonth()+1)}-${twoChars(date.getDate())}T${twoChars(date.getHours())}:${twoChars(date.getMinutes())}`;
-};
-
-const convertLocalDatetimeToUTC = (value) => {
- const re = /^([0-9]{4,})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2})/;
- const match = re.exec(value);
- const date = new Date(match[1], match[2] - 1, match[3], match[4], match[5]);
- const fullISO8601 = date.toISOString();
- return fullISO8601.slice(0, fullISO8601.indexOf('T') + 6);
-};
-
-Rails.delegate(document, '#form_admin_settings_registrations_mode', 'change', ({ target }) => onChangeRegistrationMode(target));
-
-ready(() => {
- const domainBlockSeverityInput = document.getElementById('domain_block_severity');
- if (domainBlockSeverityInput) onDomainBlockSeverityChange(domainBlockSeverityInput);
-
- const enableBootstrapTimelineAccounts = document.getElementById('form_admin_settings_enable_bootstrap_timeline_accounts');
- if (enableBootstrapTimelineAccounts) onEnableBootstrapTimelineAccountsChange(enableBootstrapTimelineAccounts);
-
- const registrationMode = document.getElementById('form_admin_settings_registrations_mode');
- if (registrationMode) onChangeRegistrationMode(registrationMode);
-
- const checkAllElement = document.querySelector('#batch_checkbox_all');
- if (checkAllElement) {
- const allCheckboxes = Array.from(document.querySelectorAll(batchCheckboxClassName));
- checkAllElement.checked = allCheckboxes.every( (content) => content.checked);
- checkAllElement.indeterminate = !checkAllElement.checked && allCheckboxes.some((content) => content.checked);
- }
-
- document.querySelector('a#add-instance-button')?.addEventListener('click', (e) => {
- const domain = document.querySelector('input[type="text"]#by_domain')?.value;
-
- if (domain) {
- const url = new URL(event.target.href);
- url.searchParams.set('_domain', domain);
- e.target.href = url;
- }
- });
-
- document.querySelectorAll('input[type="datetime-local"]').forEach(element => {
- if (element.value) {
- element.value = convertUTCDateTimeToLocal(element.value);
- }
- if (element.placeholder) {
- element.placeholder = convertUTCDateTimeToLocal(element.placeholder);
- }
- });
-
- Rails.delegate(document, 'form', 'submit', ({ target }) => {
- target.querySelectorAll('input[type="datetime-local"]').forEach(element => {
- if (element.value && element.validity.valid) {
- element.value = convertLocalDatetimeToUTC(element.value);
- }
- });
- });
-
- const announcementStartsAt = document.querySelector('input[type="datetime-local"]#announcement_starts_at');
- if (announcementStartsAt) {
- setAnnouncementEndsAttributes(announcementStartsAt);
- }
-
- document.querySelectorAll('[data-admin-component]').forEach(element => {
- const componentName = element.getAttribute('data-admin-component');
- const componentProps = JSON.parse(element.getAttribute('data-props'));
-
- import('../mastodon/containers/admin_component').then(({ default: AdminComponent }) => {
- return import('../mastodon/components/admin/' + componentName).then(({ default: Component }) => {
- const root = createRoot(element);
-
- root.render (
-
-
- ,
- );
- });
- }).catch(error => {
- console.error(error);
- });
- });
-});
diff --git a/app/javascript/packs/admin.tsx b/app/javascript/packs/admin.tsx
new file mode 100644
index 0000000000..25e0889cd9
--- /dev/null
+++ b/app/javascript/packs/admin.tsx
@@ -0,0 +1,368 @@
+import './public-path';
+import { createRoot } from 'react-dom/client';
+
+import Rails from '@rails/ujs';
+
+import ready from '../mastodon/ready';
+
+const setAnnouncementEndsAttributes = (target: HTMLInputElement) => {
+ const valid = target.value && target.validity.valid;
+ const element = document.querySelector(
+ 'input[type="datetime-local"]#announcement_ends_at',
+ );
+
+ if (!element) return;
+
+ if (valid) {
+ element.classList.remove('optional');
+ element.required = true;
+ element.min = target.value;
+ } else {
+ element.classList.add('optional');
+ element.removeAttribute('required');
+ element.removeAttribute('min');
+ }
+};
+
+Rails.delegate(
+ document,
+ 'input[type="datetime-local"]#announcement_starts_at',
+ 'change',
+ ({ target }) => {
+ if (target instanceof HTMLInputElement)
+ setAnnouncementEndsAttributes(target);
+ },
+);
+
+const batchCheckboxClassName = '.batch-checkbox input[type="checkbox"]';
+
+const showSelectAll = () => {
+ const selectAllMatchingElement = document.querySelector(
+ '.batch-table__select-all',
+ );
+ selectAllMatchingElement?.classList.add('active');
+};
+
+const hideSelectAll = () => {
+ const selectAllMatchingElement = document.querySelector(
+ '.batch-table__select-all',
+ );
+ const hiddenField = document.querySelector(
+ 'input#select_all_matching',
+ );
+ const selectedMsg = document.querySelector(
+ '.batch-table__select-all .selected',
+ );
+ const notSelectedMsg = document.querySelector(
+ '.batch-table__select-all .not-selected',
+ );
+
+ selectAllMatchingElement?.classList.remove('active');
+ selectedMsg?.classList.remove('active');
+ notSelectedMsg?.classList.add('active');
+ if (hiddenField) hiddenField.value = '0';
+};
+
+Rails.delegate(document, '#batch_checkbox_all', 'change', ({ target }) => {
+ if (!(target instanceof HTMLInputElement)) return;
+
+ const selectAllMatchingElement = document.querySelector(
+ '.batch-table__select-all',
+ );
+
+ document
+ .querySelectorAll(batchCheckboxClassName)
+ .forEach((content) => {
+ content.checked = target.checked;
+ });
+
+ if (selectAllMatchingElement) {
+ if (target.checked) {
+ showSelectAll();
+ } else {
+ hideSelectAll();
+ }
+ }
+});
+
+Rails.delegate(document, '.batch-table__select-all button', 'click', () => {
+ const hiddenField = document.querySelector(
+ '#select_all_matching',
+ );
+
+ if (!hiddenField) return;
+
+ const active = hiddenField.value === '1';
+ const selectedMsg = document.querySelector(
+ '.batch-table__select-all .selected',
+ );
+ const notSelectedMsg = document.querySelector(
+ '.batch-table__select-all .not-selected',
+ );
+
+ if (!selectedMsg || !notSelectedMsg) return;
+
+ if (active) {
+ hiddenField.value = '0';
+ selectedMsg.classList.remove('active');
+ notSelectedMsg.classList.add('active');
+ } else {
+ hiddenField.value = '1';
+ notSelectedMsg.classList.remove('active');
+ selectedMsg.classList.add('active');
+ }
+});
+
+Rails.delegate(document, batchCheckboxClassName, 'change', () => {
+ const checkAllElement = document.querySelector(
+ 'input#batch_checkbox_all',
+ );
+ const selectAllMatchingElement = document.querySelector(
+ '.batch-table__select-all',
+ );
+
+ if (checkAllElement) {
+ const allCheckboxes = Array.from(
+ document.querySelectorAll(batchCheckboxClassName),
+ );
+ checkAllElement.checked = allCheckboxes.every((content) => content.checked);
+ checkAllElement.indeterminate =
+ !checkAllElement.checked &&
+ allCheckboxes.some((content) => content.checked);
+
+ if (selectAllMatchingElement) {
+ if (checkAllElement.checked) {
+ showSelectAll();
+ } else {
+ hideSelectAll();
+ }
+ }
+ }
+});
+
+Rails.delegate(
+ document,
+ '.filter-subset--with-select select',
+ 'change',
+ ({ target }) => {
+ if (target instanceof HTMLSelectElement) target.form?.submit();
+ },
+);
+
+const onDomainBlockSeverityChange = (target: HTMLInputElement) => {
+ const rejectMediaDiv = document.querySelector(
+ '.input.with_label.domain_block_reject_media',
+ );
+ const rejectReportsDiv = document.querySelector(
+ '.input.with_label.domain_block_reject_reports',
+ );
+
+ if (rejectMediaDiv && rejectMediaDiv instanceof HTMLElement) {
+ rejectMediaDiv.style.display =
+ target.value === 'suspend' ? 'none' : 'block';
+ }
+
+ if (rejectReportsDiv && rejectReportsDiv instanceof HTMLElement) {
+ rejectReportsDiv.style.display =
+ target.value === 'suspend' ? 'none' : 'block';
+ }
+};
+
+Rails.delegate(document, '#domain_block_severity', 'change', ({ target }) => {
+ if (target instanceof HTMLInputElement) onDomainBlockSeverityChange(target);
+});
+
+const onEnableBootstrapTimelineAccountsChange = (target: HTMLInputElement) => {
+ const bootstrapTimelineAccountsField =
+ document.querySelector(
+ '#form_admin_settings_bootstrap_timeline_accounts',
+ );
+
+ if (bootstrapTimelineAccountsField) {
+ bootstrapTimelineAccountsField.disabled = !target.checked;
+ if (target.checked) {
+ bootstrapTimelineAccountsField.parentElement?.classList.remove(
+ 'disabled',
+ );
+ bootstrapTimelineAccountsField.parentElement?.parentElement?.classList.remove(
+ 'disabled',
+ );
+ } else {
+ bootstrapTimelineAccountsField.parentElement?.classList.add('disabled');
+ bootstrapTimelineAccountsField.parentElement?.parentElement?.classList.add(
+ 'disabled',
+ );
+ }
+ }
+};
+
+Rails.delegate(
+ document,
+ '#form_admin_settings_enable_bootstrap_timeline_accounts',
+ 'change',
+ ({ target }) => {
+ if (target instanceof HTMLInputElement)
+ onEnableBootstrapTimelineAccountsChange(target);
+ },
+);
+
+const onChangeRegistrationMode = (target: HTMLInputElement) => {
+ const enabled = target.value === 'approved';
+
+ document
+ .querySelectorAll(
+ '.form_admin_settings_registrations_mode .warning-hint',
+ )
+ .forEach((warning_hint) => {
+ warning_hint.style.display = target.value === 'open' ? 'inline' : 'none';
+ });
+
+ document
+ .querySelectorAll(
+ 'input#form_admin_settings_require_invite_text',
+ )
+ .forEach((input) => {
+ input.disabled = !enabled;
+ if (enabled) {
+ let element: HTMLElement | null = input;
+ do {
+ element.classList.remove('disabled');
+ element = element.parentElement;
+ } while (element && !element.classList.contains('fields-group'));
+ } else {
+ let element: HTMLElement | null = input;
+ do {
+ element.classList.add('disabled');
+ element = element.parentElement;
+ } while (element && !element.classList.contains('fields-group'));
+ }
+ });
+};
+
+const convertUTCDateTimeToLocal = (value: string) => {
+ const date = new Date(value + 'Z');
+ const twoChars = (x: number) => x.toString().padStart(2, '0');
+ return `${date.getFullYear()}-${twoChars(date.getMonth() + 1)}-${twoChars(date.getDate())}T${twoChars(date.getHours())}:${twoChars(date.getMinutes())}`;
+};
+
+function convertLocalDatetimeToUTC(value: string) {
+ const date = new Date(value);
+ const fullISO8601 = date.toISOString();
+ return fullISO8601.slice(0, fullISO8601.indexOf('T') + 6);
+}
+
+Rails.delegate(
+ document,
+ '#form_admin_settings_registrations_mode',
+ 'change',
+ ({ target }) => {
+ if (target instanceof HTMLInputElement) onChangeRegistrationMode(target);
+ },
+);
+
+async function mountReactComponent(element: Element) {
+ const componentName = element.getAttribute('data-admin-component');
+ const stringProps = element.getAttribute('data-props');
+
+ if (!stringProps) return;
+
+ const componentProps = JSON.parse(stringProps) as object;
+
+ const { default: AdminComponent } = await import(
+ '@/mastodon/containers/admin_component'
+ );
+
+ const { default: Component } = (await import(
+ `@/mastodon/components/admin/${componentName}`
+ )) as { default: React.ComponentType };
+
+ const root = createRoot(element);
+
+ root.render(
+
+
+ ,
+ );
+}
+
+ready(() => {
+ const domainBlockSeverityInput = document.querySelector(
+ 'input#domain_block_severity',
+ );
+ if (domainBlockSeverityInput)
+ onDomainBlockSeverityChange(domainBlockSeverityInput);
+
+ const enableBootstrapTimelineAccounts =
+ document.querySelector(
+ 'input#form_admin_settings_enable_bootstrap_timeline_accounts',
+ );
+ if (enableBootstrapTimelineAccounts)
+ onEnableBootstrapTimelineAccountsChange(enableBootstrapTimelineAccounts);
+
+ const registrationMode = document.querySelector(
+ 'input#form_admin_settings_registrations_mode',
+ );
+ if (registrationMode) onChangeRegistrationMode(registrationMode);
+
+ const checkAllElement = document.querySelector(
+ 'input#batch_checkbox_all',
+ );
+ if (checkAllElement) {
+ const allCheckboxes = Array.from(
+ document.querySelectorAll(batchCheckboxClassName),
+ );
+ checkAllElement.checked = allCheckboxes.every((content) => content.checked);
+ checkAllElement.indeterminate =
+ !checkAllElement.checked &&
+ allCheckboxes.some((content) => content.checked);
+ }
+
+ document
+ .querySelector('a#add-instance-button')
+ ?.addEventListener('click', (e) => {
+ const domain = document.querySelector(
+ 'input[type="text"]#by_domain',
+ )?.value;
+
+ if (domain && e.target instanceof HTMLAnchorElement) {
+ const url = new URL(e.target.href);
+ url.searchParams.set('_domain', domain);
+ e.target.href = url.toString();
+ }
+ });
+
+ document
+ .querySelectorAll('input[type="datetime-local"]')
+ .forEach((element) => {
+ if (element.value) {
+ element.value = convertUTCDateTimeToLocal(element.value);
+ }
+ if (element.placeholder) {
+ element.placeholder = convertUTCDateTimeToLocal(element.placeholder);
+ }
+ });
+
+ Rails.delegate(document, 'form', 'submit', ({ target }) => {
+ if (target instanceof HTMLFormElement)
+ target
+ .querySelectorAll('input[type="datetime-local"]')
+ .forEach((element) => {
+ if (element.value && element.validity.valid) {
+ element.value = convertLocalDatetimeToUTC(element.value);
+ }
+ });
+ });
+
+ const announcementStartsAt = document.querySelector(
+ 'input[type="datetime-local"]#announcement_starts_at',
+ );
+ if (announcementStartsAt) {
+ setAnnouncementEndsAttributes(announcementStartsAt);
+ }
+
+ document.querySelectorAll('[data-admin-component]').forEach((element) => {
+ void mountReactComponent(element);
+ });
+}).catch((reason) => {
+ throw reason;
+});