Merge pull request #12042 from tsunyoku/separate-user-tags

Separate user tags on beatmapset info

Author: notbakaneko

resources/js/beatmapsets-show/info.tsx

@@ -65,15 +65,6 @@ export default class Info extends React.Component<Props> {
     return ret;
   }
 
-  private get tags() {
-    const tags = this.controller.tags;
-
-    return [
-      ...tags.userTags.map((tag) => tag.name),
-      ...tags.mapperTags,
-    ];
-  }
-
   private get withEditDescription() {
     return this.controller.beatmapset.description.bbcode != null;
   }
@@ -196,13 +187,34 @@ export default class Info extends React.Component<Props> {
             </div>
           </div>
 
-          {this.tags.length > 0 &&
+          {this.controller.tags.userTags.length > 0 &&
+            <div className='beatmapset-info__row beatmapset-info__row--value-overflow'>
+              <h3 className='beatmapset-info__header'>
+                {trans('beatmapsets.show.info.user_tags')}
+              </h3>
+              <div className='beatmapset-info__value-overflow'>
+                {this.controller.tags.userTags.map((tag, i) => (
+                  <React.Fragment key={`${tag.name}-${i}`}>
+                    <a
+                      className='beatmapset-info__link'
+                      href={route('beatmapsets.index', { q: tag.name })}
+                    >
+                      {tag.name}
+                    </a>
+                    {' '}
+                  </React.Fragment>
+                ))}
+              </div>
+            </div>
+          }
+
+          {this.controller.tags.mapperTags.length > 0 &&
             <div className='beatmapset-info__row beatmapset-info__row--value-overflow'>
               <h3 className='beatmapset-info__header'>
-                {trans('beatmapsets.show.info.tags')}
+                {trans('beatmapsets.show.info.mapper_tags')}
               </h3>
               <div className='beatmapset-info__value-overflow'>
-                {this.tags.map((tag, i) => (
+                {this.controller.tags.mapperTags.map((tag, i) => (
                   <React.Fragment key={`${tag}-${i}`}>
                     <a
                       className='beatmapset-info__link'

resources/js/beatmapsets-show/metadata-editor.tsx

@@ -124,7 +124,7 @@ export default class MetadataEditor extends React.Component<Props> {
         {this.canEditTags &&
           <label className='simple-form__row'>
             <div className='simple-form__label'>
-              {trans('beatmapsets.show.info.tags')}
+              {trans('beatmapsets.show.info.mapper_tags')}
             </div>
 
             <textarea

resources/lang/en/beatmapsets.php

@@ -148,8 +148,9 @@
             'source' => 'Source',
             'storyboard' => 'This beatmap contains storyboard',
             'success-rate' => 'Success Rate',
-            'tags' => 'Tags',
             'video' => 'This beatmap contains video',
+            'user_tags' => 'User Tags',
+            'mapper_tags' => 'Mapper Tags',
         ],
 
         'nsfw_warning' => [