Show counts on entity list tabs (#2169)

stashapp · Jan 4, 2022 · 90a4931 · 90a4931
1 parent 849c590
commit 90a4931
Show file tree

Hide file tree

Showing 6 changed files with 150 additions and 18 deletions.
diff --git a/ui/v2.5/src/components/Changelog/versions/v0130.md b/ui/v2.5/src/components/Changelog/versions/v0130.md
@@ -1,3 +1,6 @@
+### 🎨 Improvements
+Show counts on list tabs in Performer, Studio and Tag pages. ([#2169](https://github.com/stashapp/stash/pull/2169))
+
 ### 🐛 Bug fixes
 * Generate sprites for short video files. ([#2167](https://github.com/stashapp/stash/pull/2167))
 * Fix stash-box scraping including underscores in ethnicity. ([#2191](https://github.com/stashapp/stash/pull/2191))

diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/Performer.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/Performer.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useMemo, useState } from "react";
-import { Button, Tabs, Tab } from "react-bootstrap";
+import { Button, Tabs, Tab, Badge } from "react-bootstrap";
 import { FormattedMessage, useIntl } from "react-intl";
 import { useParams, useHistory } from "react-router-dom";
 import { Helmet } from "react-helmet";
@@ -147,16 +147,56 @@ const PerformerPage: React.FC<IProps> = ({ performer }) => {
       <Tab eventKey="details" title={intl.formatMessage({ id: "details" })}>
         <PerformerDetailsPanel performer={performer} />
       </Tab>
-      <Tab eventKey="scenes" title={intl.formatMessage({ id: "scenes" })}>
+      <Tab
+        eventKey="scenes"
+        title={
+          <React.Fragment>
+            {intl.formatMessage({ id: "scenes" })}
+            <Badge className="left-spacing" pill variant="secondary">
+              {intl.formatNumber(performer.scene_count ?? 0)}
+            </Badge>
+          </React.Fragment>
+        }
+      >
         <PerformerScenesPanel performer={performer} />
       </Tab>
-      <Tab eventKey="galleries" title={intl.formatMessage({ id: "galleries" })}>
+      <Tab
+        eventKey="galleries"
+        title={
+          <React.Fragment>
+            {intl.formatMessage({ id: "galleries" })}
+            <Badge className="left-spacing" pill variant="secondary">
+              {intl.formatNumber(performer.gallery_count ?? 0)}
+            </Badge>
+          </React.Fragment>
+        }
+      >
         <PerformerGalleriesPanel performer={performer} />
       </Tab>
-      <Tab eventKey="images" title={intl.formatMessage({ id: "images" })}>
+      <Tab
+        eventKey="images"
+        title={
+          <React.Fragment>
+            {intl.formatMessage({ id: "images" })}
+            <Badge className="left-spacing" pill variant="secondary">
+              {intl.formatNumber(performer.image_count ?? 0)}
+            </Badge>
+          </React.Fragment>
+        }
+      >
         <PerformerImagesPanel performer={performer} />
       </Tab>
-      <Tab eventKey="movies" title={intl.formatMessage({ id: "movies" })}>
+      <Tab
+        eventKey="movies"
+        title={
+          <React.Fragment>
+            {intl.formatMessage({ id: "movies" })}
+            <Badge className="left-spacing" pill variant="secondary">
+              {intl.formatNumber(performer.movie_count ?? 0)}
+            </Badge>
+          </React.Fragment>
+        }
+      >
         <PerformerMoviesPanel performer={performer} />
       </Tab>
       <Tab eventKey="edit" title={intl.formatMessage({ id: "actions.edit" })}>

diff --git a/ui/v2.5/src/components/Settings/SettingsServicesPanel.tsx b/ui/v2.5/src/components/Settings/SettingsServicesPanel.tsx
@@ -117,7 +117,7 @@ export const SettingsServicesPanel: React.FC = () => {
   function renderDeadline(until?: string) {
     if (until) {
       const deadline = new Date(until);
-      return `until ${deadline.toLocaleString()}`;
+      return `until ${intl.formatDate(deadline)}`;
     }
 
     return "";

diff --git a/ui/v2.5/src/components/Studios/StudioDetails/Studio.tsx b/ui/v2.5/src/components/Studios/StudioDetails/Studio.tsx
@@ -1,4 +1,4 @@
-import { Tabs, Tab } from "react-bootstrap";
+import { Tabs, Tab, Badge } from "react-bootstrap";
 import React, { useEffect, useState } from "react";
 import { useParams, useHistory } from "react-router-dom";
 import { FormattedMessage, useIntl } from "react-intl";
@@ -216,16 +216,43 @@ const StudioPage: React.FC<IProps> = ({ studio }) => {
           activeKey={activeTabKey}
           onSelect={setActiveTabKey}
         >
-          <Tab eventKey="scenes" title={intl.formatMessage({ id: "scenes" })}>
+          <Tab
+            eventKey="scenes"
+            title={
+              <React.Fragment>
+                {intl.formatMessage({ id: "scenes" })}
+                <Badge className="left-spacing" pill variant="secondary">
+                  {intl.formatNumber(studio.scene_count ?? 0)}
+                </Badge>
+              </React.Fragment>
+            }
+          >
             <StudioScenesPanel studio={studio} />
           </Tab>
           <Tab
             eventKey="galleries"
-            title={intl.formatMessage({ id: "galleries" })}
+            title={
+              <React.Fragment>
+                {intl.formatMessage({ id: "galleries" })}
+                <Badge className="left-spacing" pill variant="secondary">
+                  {intl.formatNumber(studio.gallery_count ?? 0)}
+                </Badge>
+              </React.Fragment>
+            }
           >
             <StudioGalleriesPanel studio={studio} />
           </Tab>
-          <Tab eventKey="images" title={intl.formatMessage({ id: "images" })}>
+          <Tab
+            eventKey="images"
+            title={
+              <React.Fragment>
+                {intl.formatMessage({ id: "images" })}
+                <Badge className="left-spacing" pill variant="secondary">
+                  {intl.formatNumber(studio.image_count ?? 0)}
+                </Badge>
+              </React.Fragment>
+            }
+          >
             <StudioImagesPanel studio={studio} />
           </Tab>
           <Tab
@@ -234,12 +261,29 @@ const StudioPage: React.FC<IProps> = ({ studio }) => {
           >
             <StudioPerformersPanel studio={studio} />
           </Tab>
-          <Tab eventKey="movies" title={intl.formatMessage({ id: "movies" })}>
+          <Tab
+            eventKey="movies"
+            title={
+              <React.Fragment>
+                {intl.formatMessage({ id: "movies" })}
+                <Badge className="left-spacing" pill variant="secondary">
+                  {intl.formatNumber(studio.movie_count ?? 0)}
+                </Badge>
+              </React.Fragment>
+            }
+          >
             <StudioMoviesPanel studio={studio} />
           </Tab>
           <Tab
             eventKey="childstudios"
-            title={intl.formatMessage({ id: "subsidiary_studios" })}
+            title={
+              <React.Fragment>
+                {intl.formatMessage({ id: "subsidiary_studios" })}
+                <Badge className="left-spacing" pill variant="secondary">
+                  {intl.formatNumber(studio.child_studios?.length)}
+                </Badge>
+              </React.Fragment>
+            }
           >
             <StudioChildrenPanel studio={studio} />
           </Tab>

diff --git a/ui/v2.5/src/components/Tags/TagDetails/Tag.tsx b/ui/v2.5/src/components/Tags/TagDetails/Tag.tsx
@@ -1,4 +1,4 @@
-import { Tabs, Tab, Dropdown } from "react-bootstrap";
+import { Tabs, Tab, Dropdown, Badge } from "react-bootstrap";
 import React, { useEffect, useState } from "react";
 import { useParams, useHistory } from "react-router-dom";
 import { FormattedMessage, useIntl } from "react-intl";
@@ -297,27 +297,68 @@ const TagPage: React.FC<IProps> = ({ tag }) => {
             activeKey={activeTabKey}
             onSelect={setActiveTabKey}
           >
-            <Tab eventKey="scenes" title={intl.formatMessage({ id: "scenes" })}>
+            <Tab
+              eventKey="scenes"
+              title={
+                <React.Fragment>
+                  {intl.formatMessage({ id: "scenes" })}
+                  <Badge className="left-spacing" pill variant="secondary">
+                    {intl.formatNumber(tag.scene_count ?? 0)}
+                  </Badge>
+                </React.Fragment>
+              }
+            >
               <TagScenesPanel tag={tag} />
             </Tab>
-            <Tab eventKey="images" title={intl.formatMessage({ id: "images" })}>
+            <Tab
+              eventKey="images"
+              title={
+                <React.Fragment>
+                  {intl.formatMessage({ id: "images" })}
+                  <Badge className="left-spacing" pill variant="secondary">
+                    {intl.formatNumber(tag.image_count ?? 0)}
+                  </Badge>
+                </React.Fragment>
+              }
+            >
               <TagImagesPanel tag={tag} />
             </Tab>
             <Tab
               eventKey="galleries"
-              title={intl.formatMessage({ id: "galleries" })}
+              title={
+                <React.Fragment>
+                  {intl.formatMessage({ id: "galleries" })}
+                  <Badge className="left-spacing" pill variant="secondary">
+                    {intl.formatNumber(tag.gallery_count ?? 0)}
+                  </Badge>
+                </React.Fragment>
+              }
             >
               <TagGalleriesPanel tag={tag} />
             </Tab>
             <Tab
               eventKey="markers"
-              title={intl.formatMessage({ id: "markers" })}
+              title={
+                <React.Fragment>
+                  {intl.formatMessage({ id: "markers" })}
+                  <Badge className="left-spacing" pill variant="secondary">
+                    {intl.formatNumber(tag.scene_marker_count ?? 0)}
+                  </Badge>
+                </React.Fragment>
+              }
             >
               <TagMarkersPanel tag={tag} />
             </Tab>
             <Tab
               eventKey="performers"
-              title={intl.formatMessage({ id: "performers" })}
+              title={
+                <React.Fragment>
+                  {intl.formatMessage({ id: "performers" })}
+                  <Badge className="left-spacing" pill variant="secondary">
+                    {intl.formatNumber(tag.performer_count ?? 0)}
+                  </Badge>
+                </React.Fragment>
+              }
             >
               <TagPerformersPanel tag={tag} />
             </Tab>

diff --git a/ui/v2.5/src/index.scss b/ui/v2.5/src/index.scss
@@ -752,3 +752,7 @@ select {
   background: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4.95 10' fill='%23fff'><polygon points='1.41 4.67 2.48 3.18 3.54 4.67 1.41 4.67'/><polygon points='3.54 5.33 2.48 6.82 1.41 5.33 3.54 5.33'/></svg>")
     no-repeat right 2px center;
 }
+
+.left-spacing {
+  margin-left: 0.5em;
+}