Move component props from stash to stash.component_props

lib/MusicBrainz/Server.pm

@@ -440,19 +440,14 @@ sub TO_JSON {
         current_language_html
         entity
         hide_merge_helper
-        instrument_types
-        instruments_by_type
-        isrcs
         jsonld_data
         last_replication_date
         linked_entities
         makes_no_changes
         merge_link
         new_edit_notes
-        recordings
         server_details
         server_languages
-        tag
         to_merge
     );
 

lib/MusicBrainz/Server/Controller/ISRC.pm

@@ -35,9 +35,12 @@ sub show : Chained('load') PathPart('')
     my @recordings = sort_by { $_->name } $c->model('Recording')->load(@$isrcs);
     $c->model('ArtistCredit')->load(@recordings);
     $c->stash(
-        recordings => \@recordings,
         current_view => 'Node',
         component_path => 'isrc/Index.js',
+        component_props => {
+            isrcs => $isrcs,
+            recordings => \@recordings
+        }
     );
 }
 

lib/MusicBrainz/Server/Controller/Instrument.pm

@@ -157,10 +157,12 @@ sub list : Path('/instruments') Args(0) {
     }
 
     $c->stash(
-        instruments_by_type => $entities,
-        instrument_types => \@types,
         current_view => 'Node',
         component_path => 'instrument/List',
+        component_props => {
+            instruments_by_type => $entities,
+            instrument_types => \@types
+        }
     );
 }
 

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;
 }

root/instrument/List.js

@@ -1,4 +1,5 @@
-/* @flow
+/*
+ * @flow
  * Copyright (C) 2018 Shamroy Pellew
  *
  * This file is part of MusicBrainz, the open internet music database,
@@ -15,59 +16,62 @@ const {l} = require('../static/scripts/common/i18n');
 const {lp_attributes} = require('../static/scripts/common/i18n/attributes');
 const {l_instrument_descriptions} = require('../static/scripts/common/i18n/instrument_descriptions');
 
+type PropsT = {|
+  +instrument_types: $ReadOnlyArray<InstrumentTypeT>,
+  +instruments_by_type: {|
+    +[number]: $ReadOnlyArray<InstrumentT>,
+    +unknown: $ReadOnlyArray<InstrumentT>,
+  |},
+|};
+
 const Instrument = ({instrument}) => (
   <li>
     <EntityLink entity={instrument} />
     {instrument.description
-      ? <Frag>
+      ? (
+        <Frag>
           {' — '}
           <span
             className="description"
-            dangerouslySetInnerHTML={{
-              __html: l_instrument_descriptions(instrument.description),
-            }}
+            dangerouslySetInnerHTML={{__html: l_instrument_descriptions(instrument.description)}}
           />
         </Frag>
+      )
       : null}
   </li>
 );
 
-const InstrumentList = () => {
-  const instrumentTypes = $c.stash.instrument_types;
-  if (!instrumentTypes) {
-    return null;
-  }
-
-  const instrumentsByType = $c.stash.instruments_by_type;
-  if (!instrumentsByType) {
-    return null;
-  }
-
+const InstrumentList = ({
+  instrument_types: instrumentTypes,
+  instruments_by_type: instrumentsByType,
+}: PropsT) => {
   const unknown = instrumentsByType.unknown;
 
   return (
-    <Layout title={l('Instrument List')} fullWidth={true}>
+    <Layout fullWidth title={l('Instrument List')}>
       <div id="content">
         <h1>{l('Instrument List')}</h1>
         {instrumentTypes.map(type => (
-          <Frag>
+          <Frag key={type.id}>
             <h2>{lp_attributes(type.name, 'instrument_type')}</h2>
             <ul>
               {instrumentsByType[type.id].map(instrument => (
-                <Instrument key={instrument.id} instrument={instrument} />
+                <Instrument instrument={instrument} key={instrument.id} />
               ))}
             </ul>
           </Frag>
         ))}
         {(unknown && unknown.length)
-          ? <Frag>
+          ? (
+            <Frag>
               <h2>{l('Unclassified instrument')}</h2>
               <ul>
                 {unknown.map(instrument => (
-                  <Instrument key={instrument.id} instrument={instrument} />
+                  <Instrument instrument={instrument} key={instrument.id} />
                 ))}
               </ul>
             </Frag>
+          )
           : null}
       </div>
     </Layout>

root/isrc/Index.js

@@ -17,15 +17,13 @@ const {l, ln} = require('../static/scripts/common/i18n');
 const {artistCreditFromArray} = require('../static/scripts/common/immutable-entities');
 const formatTrackLength = require('../static/scripts/common/utility/formatTrackLength');
 
-const Index = () => {
-  const isrcs = $c.stash.isrcs;
-  const recordings = $c.stash.recordings;
-  const userExists = $c.user_exists;
-
-  if (!isrcs || !recordings) {
-    return null;
-  }
+type PropsT = {|
+  +isrcs: $ReadOnlyArray<IsrcT>,
+  +recordings: $ReadOnlyArray<RecordingT>,
+|};
 
+const Index = ({isrcs, recordings}: PropsT) => {
+  const userExists = $c.user_exists;
   const isrc = isrcs[0];
   return (
     <Layout fullWidth title={l('ISRC “{isrc}”', {isrc: isrc.isrc})}>

root/tag/NotFound.js

@@ -11,14 +11,14 @@ 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.',
-        {__react: true, search_url: '/search'})}
+        {__react: true, url: '/search'})}
     </p>
   </NotFound>
 );

root/types.js

@@ -99,14 +99,6 @@ type CatalystUserT = {|
 |};
 
 type CatalystStashT = {|
-  +instruments_by_type?: {|
-    +[number]: $ReadOnlyArray<InstrumentT>,
-    +unknown: $ReadOnlyArray<InstrumentT>,
-  |},
-  +instrument_types?: $ReadOnlyArray<InstrumentTypeT>,
-  +isrcs?: $ReadOnlyArray<IsrcT>,
-  +recordings?: $ReadOnlyArray<RecordingT>,
-  +tag?: string,
 |};
 
 type CommentRoleT = {|+comment: string|};