Refactor tag not found to use passed props

metabrainz · Mar 12, 2018 · 60217b4 · 60217b4
1 parent 81c54ec
commit 60217b4
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/lib/MusicBrainz/Server.pm b/lib/MusicBrainz/Server.pm
@@ -448,7 +448,6 @@ sub TO_JSON {
         new_edit_notes
         server_details
         server_languages
-        tag
         to_merge
     );
 

diff --git a/lib/MusicBrainz/Server/Controller/Tag.pm b/lib/MusicBrainz/Server/Controller/Tag.pm
@@ -78,7 +78,7 @@ sub not_found : Private
     $c->stash(
         current_view => 'Node',
         component_path => 'tag/NotFound.js',
-        tag => $tagname,
+        component_props => {tag => $tagname}
     );
     $c->detach;
 }

diff --git a/root/tag/NotFound.js b/root/tag/NotFound.js
@@ -11,10 +11,10 @@ const React = require('react');
 const NotFound = require('../components/NotFound');
 const {l} = require('../static/scripts/common/i18n');
 
-const TagNotFound = () => (
+const TagNotFound = ({tag}: {+tag: string}) => (
   <NotFound title={l('Tag Not Used')}>
     <p>
-      {l('No MusicBrainz entities have yet been tagged with "{tag}".', {tag: $c.stash.tag})}
+      {l('No MusicBrainz entities have yet been tagged with "{tag}".', {tag: tag})}
     </p>
     <p>
       {l('If you wish to use this tag, please {url|search} for the entity first and apply the tag using the sidebar.',

diff --git a/root/types.js b/root/types.js
@@ -99,7 +99,6 @@ type CatalystUserT = {|
 |};
 
 type CatalystStashT = {|
-  +tag?: string,
 |};
 
 type CommentRoleT = {|+comment: string|};