PR fixup

kbss-cvut · Aug 12, 2024 · f5624d1 · f5624d1
1 parent e8e378c
commit f5624d1
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 34 deletions.
diff --git a/src/component/asset/RemoveAssetDialog.tsx b/src/component/asset/RemoveAssetDialog.tsx
@@ -35,6 +35,7 @@ const RemoveAssetDialog: React.FC<RemoveAssetDialogProps> = (props) => {
         label: props.asset.getLabel(),
       })}
       confirmKey="remove"
+      confirmColor="outline-danger"
     >
       <Label>
         {formatMessage("asset.remove.dialog.text", {

diff --git a/src/component/misc/ConfirmCancelDialog.tsx b/src/component/misc/ConfirmCancelDialog.tsx
@@ -44,7 +44,7 @@ const ConfirmCancelDialog: React.FC<ConfirmCancelDialogProps> = (props) => {
         <ButtonToolbar className="float-right">
           <Button
             id={`${props.id}-submit`}
-            color={props.confirmColor || "primary"}
+            color={props.confirmColor}
             size="sm"
             disabled={props.confirmDisabled}
             onClick={props.onConfirm}
@@ -53,7 +53,7 @@ const ConfirmCancelDialog: React.FC<ConfirmCancelDialogProps> = (props) => {
           </Button>
           <Button
             id={`${props.id}-cancel`}
-            color={props.cancelColor || "outline-dark"}
+            color={props.cancelColor}
             size="sm"
             onClick={props.onClose}
           >
@@ -66,8 +66,10 @@ const ConfirmCancelDialog: React.FC<ConfirmCancelDialogProps> = (props) => {
 };
 
 ConfirmCancelDialog.defaultProps = {
-  cancelKey: "cancel",
+  confirmColor: "primary",
   confirmDisabled: false,
+  cancelKey: "cancel",
+  cancelColor: "outline-dark",
 };
 
 export default ConfirmCancelDialog;
diff --git a/src/component/vocabulary/RemoveVocabularyDialog.scss b/src/component/vocabulary/RemoveVocabularyDialog.scss
@@ -1,7 +1,4 @@
 #remove-vocabulary-dialog {
-  .modal-header {
-    background-color: var(--danger);
-  }
   .modal-body {
     ul {
       padding: 0;
@@ -11,6 +8,11 @@
       padding: 5px 0 5px 10px;
       border-bottom: 1px solid lightgray;
     }
+    details {
+      .row:hover {
+        background-color: rgba(0, 126, 255, 0.1);
+      }
+    }
   }
 }
 

diff --git a/src/component/vocabulary/RemoveVocabularyDialog.tsx b/src/component/vocabulary/RemoveVocabularyDialog.tsx
@@ -1,7 +1,7 @@
 import { useI18n } from "../hook/useI18n";
 import Utils from "../../util/Utils";
 import ConfirmCancelDialog from "../misc/ConfirmCancelDialog";
-import { Label } from "reactstrap";
+import { Col, Label, Row } from "reactstrap";
 import Vocabulary from "../../model/Vocabulary";
 import PromiseTrackingMask from "../misc/PromiseTrackingMask";
 import { useEffect, useState } from "react";
@@ -82,10 +82,6 @@ const RemoveVocabularyDialog: React.FC<RemoveVocabularyDialogProps> = (
     return () => controller.abort();
   }, [props.vocabulary, props.show, dispatch]);
 
-  const cancel = () => {
-    props.onCancel();
-  };
-
   const submit = () => {
     if (validateInput() !== ValidationResult.VALID && !canRemoveSilently) {
       return;
@@ -100,28 +96,28 @@ const RemoveVocabularyDialog: React.FC<RemoveVocabularyDialogProps> = (
   ) =>
     statements.map((statement, index) => {
       return (
-        <li key={keyBase + index}>
-          <span id={keyBase + index + "object"}>
-            <LinkComponent iri={statement.object.iri} />
-          </span>
-          <br />
-          <span id={keyBase + index + "relation"}>
-            <AssetLabel iri={statement.relation.iri} shrinkFullIri={true} />
-            <CopyIriIcon url={statement.relation.iri} />
-          </span>
-          <br />
-          <span id={keyBase + index + "subject"}>
-            <AssetLabel iri={statement.subject.iri} shrinkFullIri={true} />
-            <CopyIriIcon url={statement.subject.iri} />
-          </span>
-        </li>
+        <Row key={keyBase + index + "row"}>
+          <Col md={4} xs={12}>
+            <span id={keyBase + index + "object"}>
+              <LinkComponent iri={statement.object.iri} />
+            </span>
+          </Col>
+          <Col md={4} xs={12}>
+            <span id={keyBase + index + "relation"}>
+              <AssetLabel iri={statement.relation.iri} shrinkFullIri={true} />
+              <CopyIriIcon url={statement.relation.iri} />
+            </span>
+          </Col>
+          <Col md={4} xs={12}>
+            <span id={keyBase + index + "subject"}>
+              <AssetLabel iri={statement.subject.iri} shrinkFullIri={true} />
+              <CopyIriIcon url={statement.subject.iri} />
+            </span>
+          </Col>
+        </Row>
       );
     });
 
-  const onInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    setconfirmationVocabularyName(e.currentTarget.value);
-  };
-
   const isConfirmDisabled =
     !canRemoveSilently &&
     (!canRemove ||
@@ -157,7 +153,9 @@ const RemoveVocabularyDialog: React.FC<RemoveVocabularyDialogProps> = (
         <CustomInput
           label={i18n("vocabulary.remove.dialog.input.label")}
           value={confirmationVocabularyName}
-          onChange={onInputChange}
+          onChange={(e: React.ChangeEvent<HTMLInputElement>) =>
+            setconfirmationVocabularyName(e.currentTarget.value)
+          }
           validation={validateInput()}
         />
       </If>
@@ -219,7 +217,7 @@ const RemoveVocabularyDialog: React.FC<RemoveVocabularyDialogProps> = (
     <ConfirmCancelDialog
       show={props.show}
       id="remove-vocabulary-dialog"
-      onClose={cancel}
+      onClose={() => props.onCancel()}
       onConfirm={submit}
       confirmColor={"outline-danger"}
       confirmDisabled={isConfirmDisabled}

diff --git a/src/component/vocabulary/VocabularySummary.tsx b/src/component/vocabulary/VocabularySummary.tsx
@@ -111,6 +111,7 @@ export class VocabularySummary extends EditableComponent<
     }
     if (prevProps.vocabulary.iri !== vocabulary.iri) {
       this.onCloseEdit();
+      this.onCloseRemove();
       this.setState({
         language: resolveInitialLanguage(
           vocabulary,

diff --git a/src/i18n/cs.ts b/src/i18n/cs.ts
@@ -388,9 +388,9 @@ const cs = {
     "vocabulary.select-vocabulary": "Vyberte slovník",
 
     "vocabulary.remove.dialog.text.nonEmpty":
-      "Opravdu chcete odstranit  <b>neprázdný</b> slovník?",
+      "Opravdu chcete odstranit <b>neprázdný</b> slovník?",
     "vocabulary.remove.dialog.text.empty":
-      "Opravdu chcete odstranit  <b>prázdný</b> slovník?",
+      "Opravdu chcete odstranit <b>prázdný</b> slovník?",
     "vocabulary.remove.dialog.text.termCount":
       "Jeho odstraněním dojde k trvalému smazání {count, plural, one {<b>1</b> pojmu} other {<b>#</b> pojmů}}, dokumentu a všech souvisejících souborů.",
     "vocabulary.remove.dialog.text.permanent": "Tato akce je nevratná!",