From 92de8fb396265d057f18aab4de0bc8aff4b90188 Mon Sep 17 00:00:00 2001
From: f0x52 <f0x@cthu.lu>
Date: Sat, 19 Aug 2023 14:33:15 +0200
Subject: [feature] Instance rules (#2125)

* init instance rules database model, admin api

* expose instance rules in public instance api

* public /api/v1/instance/rules route

* GET ruleById

* createRule route

* createRule auth check

* updateRule

* deleteRule

* list rules on about page

* ruleGet auth

* add about page ids for anchors

* process and store adding violated rules to reports

* admin api models for instance rules

* instance rule edit frontend

* change rule inputs to textareas

* database fixes after rebase (#2124)

* remove unused imports

* fix db migration column name

* fix tests

* fix more tests

* fix postgres error with wrongly used Ident

* add some tests, fiddle with rule model a bit, fix postgres migration

* swagger docs

---------

Co-authored-by: tsmethurst <tobi.smethurst@protonmail.com>
---
 web/source/settings/admin/federation/detail.js | 35 +++++++++++++++-----------
 1 file changed, 21 insertions(+), 14 deletions(-)

(limited to 'web/source/settings/admin/federation')

diff --git a/web/source/settings/admin/federation/detail.js b/web/source/settings/admin/federation/detail.js
index 344b9f9b6..a3bbfcac1 100644
--- a/web/source/settings/admin/federation/detail.js
+++ b/web/source/settings/admin/federation/detail.js
@@ -141,22 +141,29 @@ function DomainBlockForm({ defaultDomain, block = {}, baseUrl }) {
 				{...disabledForm}
 			/>
 
-			<MutationButton
-				label="Suspend"
-				result={addResult}
-				{...disabledForm}
-			/>
-
-			{
-				isExistingBlock &&
+			<div className="action-buttons row">
 				<MutationButton
-					type="button"
-					onClick={() => removeBlock(block.id)}
-					label="Remove"
-					result={removeResult}
-					className="button danger"
+					label="Suspend"
+					result={addResult}
+					showError={false}
+					{...disabledForm}
 				/>
-			}
+
+				{
+					isExistingBlock &&
+					<MutationButton
+						type="button"
+						onClick={() => removeBlock(block.id)}
+						label="Remove"
+						result={removeResult}
+						className="button danger"
+						showError={false}
+					/>
+				}
+			</div>
+
+			{addResult.error && <Error error={addResult.error} />}
+			{removeResult.error && <Error error={removeResult.error} />}
 
 		</form>
 	);
-- 
cgit v1.2.3