diff --git a/fakeyou/src/v2/view/moderation/moderation_tts_category_list/ModerationTtsCategoryListPage.tsx b/fakeyou/src/v2/view/moderation/moderation_tts_category_list/ModerationTtsCategoryListPage.tsx index 7bc1951b42..ceb27b467d 100644 --- a/fakeyou/src/v2/view/moderation/moderation_tts_category_list/ModerationTtsCategoryListPage.tsx +++ b/fakeyou/src/v2/view/moderation/moderation_tts_category_list/ModerationTtsCategoryListPage.tsx @@ -69,8 +69,8 @@ function ModerationTtsCategoryListPage(props: Props) { {ttsCategories.map(category => { - let name = <>{category.name}; + if (!!category.maybe_dropdown_name) { name = ( <> diff --git a/fakeyou/src/v2/view/tts/tts_model_view/TtsModelViewFc.tsx b/fakeyou/src/v2/view/tts/tts_model_view/TtsModelViewFc.tsx index 89cbd81b77..730e4f8e4a 100644 --- a/fakeyou/src/v2/view/tts/tts_model_view/TtsModelViewFc.tsx +++ b/fakeyou/src/v2/view/tts/tts_model_view/TtsModelViewFc.tsx @@ -198,10 +198,11 @@ function TtsModelViewFc(props: Props) { ); } - let editModelButton = ; - let editModelCategoriesButton = ; + let canEditModel = props.sessionWrapper.canEditTtsModelByUserToken(ttsModel?.creator_user_token); - if (props.sessionWrapper.canEditTtsModelByUserToken(ttsModel?.creator_user_token)) { + let editModelButton = ; + + if (canEditModel) { editModelButton = ( <>
@@ -211,14 +212,6 @@ function TtsModelViewFc(props: Props) { >Edit Model Details ); - editModelCategoriesButton = ( - <> - Edit Model Categories - - ); } let deleteModelButton = ; @@ -259,21 +252,49 @@ function TtsModelViewFc(props: Props) { ); } - let modelCategories = null; - if (assignedCategories.length !== 0) { - modelCategories = ( + const showCategorySection = canEditModel || assignedCategories.length !== 0; + let modelCategoriesSection = <>; + + if (showCategorySection) { + let modelCategories = null; + + if (assignedCategories.length !== 0) { + modelCategories = ( + <> +
+
    + {assignedCategories.map(category => { + return ( + <> +
  • {category.name}
  • + + ); + })} +
+
+ + ); + } + + let editModelCategoriesButton = null; + + if (canEditModel) { + editModelCategoriesButton = ( + <> + Edit Model Categories + + ); + } + + modelCategoriesSection = ( <> -
-
    - {assignedCategories.map(category => { - return ( - <> -
  • {category.name}
  • - - ); - })} -
-
+

Model Categories

+ {modelCategories} + {editModelCategoriesButton} +
); } @@ -327,10 +348,7 @@ function TtsModelViewFc(props: Props) { {modelDescription} -

Model Categories

- {modelCategories} - {editModelCategoriesButton} -
+ {modelCategoriesSection}