Skip to content

Commit b4ce730

Browse files
committed
Merge branch 'beta'
* beta: MBS-11525: Link to downvoted per-entity list when seeing downvotes Restore original class names for collapse/expand-medium MBS-11530: Avoid common/MB/release code running on these
2 parents edfc2e6 + 7b4cfaf commit b4ce730

File tree

5 files changed

+22
-16
lines changed

5 files changed

+22
-16
lines changed

root/components/TagEntitiesList.js

+16-12
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,18 @@ const TagEntitiesList = ({
6363
entityType: string,
6464
title: string,
6565
seeAllMessage: $Call<typeof N_ln, string, string>,
66+
showDownvoted: boolean,
6667
) => {
6768
const tags = taggedEntities[entityType];
6869

6970
if (!tags || !tags.count) {
7071
return null;
7172
}
7273

73-
const url = ENTITIES[entityType].url;
74+
const url = showDownvoted
75+
? ENTITIES[entityType].url + '?show_downvoted=1'
76+
: ENTITIES[entityType].url;
77+
7478

7579
return (
7680
<React.Fragment key={entityType}>
@@ -154,47 +158,47 @@ const TagEntitiesList = ({
154158
{buildTagEntitiesListSection('area', l('Areas'), N_ln(
155159
'See all {num} areas',
156160
'See all {num} areas',
157-
))}
161+
), showDownvoted)}
158162
{buildTagEntitiesListSection('artist', l('Artists'), N_ln(
159163
'See all {num} artists',
160164
'See all {num} artists',
161-
))}
165+
), showDownvoted)}
162166
{buildTagEntitiesListSection('event', l('Events'), N_ln(
163167
'See all {num} events',
164168
'See all {num} events',
165-
))}
169+
), showDownvoted)}
166170
{buildTagEntitiesListSection('instrument', l('Instruments'), N_ln(
167171
'See all {num} instruments',
168172
'See all {num} instruments',
169-
))}
173+
), showDownvoted)}
170174
{buildTagEntitiesListSection('label', l('Labels'), N_ln(
171175
'See all {num} labels',
172176
'See all {num} labels',
173-
))}
177+
), showDownvoted)}
174178
{buildTagEntitiesListSection('place', l('Places'), N_ln(
175179
'See all {num} places',
176180
'See all {num} places',
177-
))}
181+
), showDownvoted)}
178182
{buildTagEntitiesListSection('release_group', l('Release Groups'), N_ln(
179183
'See all {num} release groups',
180184
'See all {num} release groups',
181-
))}
185+
), showDownvoted)}
182186
{buildTagEntitiesListSection('release', l('Releases'), N_ln(
183187
'See all {num} releases',
184188
'See all {num} releases',
185-
))}
189+
), showDownvoted)}
186190
{buildTagEntitiesListSection('recording', l('Recordings'), N_ln(
187191
'See all {num} recordings',
188192
'See all {num} recordings',
189-
))}
193+
), showDownvoted)}
190194
{buildTagEntitiesListSection('series', l('Series'), N_ln(
191195
'See all {num} series',
192196
'See all {num} series',
193-
))}
197+
), showDownvoted)}
194198
{buildTagEntitiesListSection('work', l('Works'), N_ln(
195199
'See all {num} works',
196200
'See all {num} works',
197-
))}
201+
), showDownvoted)}
198202
</>
199203
);
200204
};

root/release/index.tt

+2
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,6 @@
6161
[%- END -%]
6262
</div>
6363
[% END %]
64+
65+
[% script_manifest('release/index.js', {async => 'async'}) %]
6466
[%- END -%]

root/static/scripts/common.js

-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ import(/* webpackChunkName: "common-menu" */ './common/MB/Control/Menu');
5454
import(
5555
/* webpackChunkName: "common-edit-search" */ './common/MB/edit_search'
5656
);
57-
import(/* webpackChunkName: "common-release" */ './common/MB/release');
5857
import(/* webpackChunkName: "common-ratings" */ './common/ratings');
5958
import(/* webpackChunkName: "common-tagger" */ './common/tagger');
6059
import(/* webpackChunkName: "common-cover-art" */ './common/coverart');

root/static/scripts/common/MB/release.js root/static/scripts/release/index.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
import $ from 'jquery';
1010

11-
import request from '../utility/request';
12-
import getBooleanCookie from '../utility/getBooleanCookie';
13-
import setCookie from '../utility/setCookie';
11+
import request from '../common/utility/request';
12+
import getBooleanCookie from '../common/utility/getBooleanCookie';
13+
import setCookie from '../common/utility/setCookie';
1414

1515
$(function () {
1616
var $bottomCredits = $('#bottom-credits');

webpack.client.config.js

+1
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ const entries = [
5656
'recording/form',
5757
'recording/merge',
5858
'release/coverart',
59+
'release/index',
5960
'release-editor',
6061
'release-group/index',
6162
'series',

0 commit comments

Comments
 (0)