Merge pull request metabrainz#2221 from reosarevok/MBS-11839

MBS-11839: Convert Remove Relationship Attribute edit to React

Author: mwiencek

lib/MusicBrainz/Server/Edit/Relationship/RemoveLinkAttribute.pm

@@ -13,6 +13,7 @@ with 'MusicBrainz::Server::Edit::Role::AlwaysAutoEdit';
 sub edit_name { N_l('Remove relationship attribute') }
 sub edit_kind { 'remove' }
 sub edit_type { $EDIT_RELATIONSHIP_REMOVE_LINK_ATTRIBUTE }
+sub edit_template_react { 'RemoveRelationshipAttribute' }
 
 has '+data' => (
     isa => Dict[
@@ -24,6 +25,15 @@ has '+data' => (
     ]
 );
 
+sub build_display_data {
+    my ($self, $loaded) = @_;
+
+    return {
+        description => $self->data->{description},
+        name => $self->data->{name},
+    };
+}
+
 sub accept {
     my $self = shift;
     $self->c->model('LinkAttributeType')->delete($self->data->{id})

root/edit/details/AddRelationshipType.js

@@ -102,7 +102,6 @@ const AddRelationshipType = ({
                   {rawIconSection}
                 </>
               ) : lp('(none)', 'description')}
-            {}
           </td>
         </tr>
 

root/edit/details/RemoveRelationshipAttribute.js

@@ -0,0 +1,64 @@
+/*
+ * @flow strict
+ * Copyright (C) 2021 MetaBrainz Foundation
+ *
+ * This file is part of MusicBrainz, the open internet music database,
+ * and is licensed under the GPL version 2, or (at your option) any
+ * later version: http://www.gnu.org/licenses/gpl-2.0.txt
+ */
+
+import * as React from 'react';
+
+import IntentionallyRawIcon from '../components/IntentionallyRawIcon';
+
+type RemoveRelationshipAttributeEditT = {
+  ...EditT,
+  +display_data: {
+    +description: string | null,
+    +name: string,
+  },
+};
+
+type Props = {
+  +edit: RemoveRelationshipAttributeEditT,
+};
+
+const RemoveRelationshipAttribute = ({
+  edit,
+}: Props): React.Element<'table'> => {
+  const display = edit.display_data;
+
+  const rawIconSection = (
+    <>
+      {' '}
+      <IntentionallyRawIcon />
+    </>
+  );
+
+  return (
+    <table className="details remove-relationship-attribute">
+      <tr>
+        <th>{addColonText(l('Name'))}</th>
+        <td>
+          {display.name}
+          {rawIconSection}
+        </td>
+      </tr>
+
+      <tr>
+        <th>{addColonText(l('Description'))}</th>
+        <td>
+          {nonEmpty(display.description)
+            ? (
+              <>
+                {display.description}
+                {rawIconSection}
+              </>
+            ) : lp('(none)', 'description')}
+        </td>
+      </tr>
+    </table>
+  );
+};
+
+export default RemoveRelationshipAttribute;

root/edit/details/RemoveRelationshipType.js

@@ -74,7 +74,6 @@ const RemoveRelationshipType = ({edit}: Props): React.Element<'table'> => {
                 {rawIconSection}
               </>
             ) : lp('(none)', 'description')}
-          {}
         </td>
       </tr>
 

root/edit/details/remove_relationship_attribute.tt

@@ -395,6 +395,7 @@ module.exports = {
   'edit/details/RemoveIswc': require('../edit/details/RemoveIswc'),
   'edit/details/RemoveMedium': require('../edit/details/RemoveMedium'),
   'edit/details/RemoveRelationship': require('../edit/details/RemoveRelationship'),
+  'edit/details/RemoveRelationshipAttribute': require('../edit/details/RemoveRelationshipAttribute'),
   'edit/details/RemoveRelationshipType': require('../edit/details/RemoveRelationshipType'),
   'edit/details/RemoveReleaseLabel': require('../edit/details/RemoveReleaseLabel'),
   'edit/details/ReorderCoverArt': require('../edit/details/ReorderCoverArt'),