From 9591faf3d4a5151ba79e3f71c8f0c604052bf08b Mon Sep 17 00:00:00 2001
From: gitgiggety <79809426+gitgiggety@users.noreply.github.com>
Date: Mon, 12 Jul 2021 12:56:38 +0200
Subject: [PATCH] Mobile fixes (#1539)

* Make new tag, gallery and studio pages mobile friendly
* Enable new button on mobile
* Update movies edit HTML to be more in line with scene

Update the code of the MovieEditPanel to be more in sync with the
SceneEditPanel. Changes made are:
 * Use FormUtil.renderLabel instead of manually building
 * Always apply xs=9 breakpoint

This fixes some layout issues on mobile while still looking the same on
tablet and desktop resolution.

* Enable delete button for tags, studios and movies on mobile
* Add changelog

Co-authored-by: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
---
 .../src/components/Changelog/Changelog.tsx    | 10 ++-
 .../src/components/Changelog/versions/v090.md |  2 +
 .../Galleries/GalleryDetails/Gallery.tsx      |  2 +-
 ui/v2.5/src/components/MainNavbar.tsx         |  2 +-
 .../Movies/MovieDetails/MovieEditPanel.tsx    | 63 +++++++++----------
 .../components/Shared/DetailsEditNavbar.tsx   |  2 +-
 .../Studios/StudioDetails/Studio.tsx          |  2 +-
 .../src/components/Tags/TagDetails/Tag.tsx    |  2 +-
 8 files changed, 44 insertions(+), 41 deletions(-)
 create mode 100644 ui/v2.5/src/components/Changelog/versions/v090.md

diff --git a/ui/v2.5/src/components/Changelog/Changelog.tsx b/ui/v2.5/src/components/Changelog/Changelog.tsx
index 5b7608034..87b8ff1db 100644
--- a/ui/v2.5/src/components/Changelog/Changelog.tsx
+++ b/ui/v2.5/src/components/Changelog/Changelog.tsx
@@ -11,6 +11,7 @@ import V050 from "./versions/v050.md";
 import V060 from "./versions/v060.md";
 import V070 from "./versions/v070.md";
 import V080 from "./versions/v080.md";
+import V090 from "./versions/v090.md";
 import { MarkdownPage } from "../Shared/MarkdownPage";
 
 // to avoid use of explicit any
@@ -49,9 +50,9 @@ const Changelog: React.FC = () => {
   // after new release:
   // add entry to releases, using the current* fields
   // then update the current fields.
-  const currentVersion = stashVersion || "v0.8.0";
+  const currentVersion = stashVersion || "v0.9.0";
   const currentDate = buildDate;
-  const currentPage = V080;
+  const currentPage = V090;
 
   const releases: IStashRelease[] = [
     {
@@ -60,6 +61,11 @@ const Changelog: React.FC = () => {
       page: currentPage,
       defaultOpen: true,
     },
+    {
+      version: "v0.8.0",
+      date: "2021-07-02",
+      page: V080,
+    },
     {
       version: "v0.7.0",
       date: "2021-05-15",
diff --git a/ui/v2.5/src/components/Changelog/versions/v090.md b/ui/v2.5/src/components/Changelog/versions/v090.md
new file mode 100644
index 000000000..0feb9ec2a
--- /dev/null
+++ b/ui/v2.5/src/components/Changelog/versions/v090.md
@@ -0,0 +1,2 @@
+### 🐛 Bug fixes
+* Show New and Delete buttons in mobile view. ([#1539](https://github.com/stashapp/stash/pull/1539))
\ No newline at end of file
diff --git a/ui/v2.5/src/components/Galleries/GalleryDetails/Gallery.tsx b/ui/v2.5/src/components/Galleries/GalleryDetails/Gallery.tsx
index 1cb433028..b438d54a7 100644
--- a/ui/v2.5/src/components/Galleries/GalleryDetails/Gallery.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryDetails/Gallery.tsx
@@ -277,7 +277,7 @@ export const Gallery: React.FC = () => {
   if (isNew)
     return (
       <div className="row new-view">
-        <div className="col-6">
+        <div className="col-md-6">
           <h2>
             <FormattedMessage
               id="actions.create_entity"
diff --git a/ui/v2.5/src/components/MainNavbar.tsx b/ui/v2.5/src/components/MainNavbar.tsx
index d91bf1f61..54f34d4a8 100644
--- a/ui/v2.5/src/components/MainNavbar.tsx
+++ b/ui/v2.5/src/components/MainNavbar.tsx
@@ -285,7 +285,7 @@ export const MainNavbar: React.FC = () => {
           </Fade>
         </Navbar.Collapse>
         <Nav className="order-2 flex-row">
-          <div className="d-none d-sm-block">{newButton}</div>
+          <div>{newButton}</div>
           <Nav.Link
             href="https://opencollective.com/stashapp"
             target="_blank"
diff --git a/ui/v2.5/src/components/Movies/MovieDetails/MovieEditPanel.tsx b/ui/v2.5/src/components/Movies/MovieDetails/MovieEditPanel.tsx
index c4fee4c07..24d7f3af1 100644
--- a/ui/v2.5/src/components/Movies/MovieDetails/MovieEditPanel.tsx
+++ b/ui/v2.5/src/components/Movies/MovieDetails/MovieEditPanel.tsx
@@ -23,7 +23,7 @@ import {
   Row,
   InputGroup,
 } from "react-bootstrap";
-import { DurationUtils, ImageUtils } from "src/utils";
+import { DurationUtils, FormUtils, ImageUtils } from "src/utils";
 import { RatingStars } from "src/components/Scenes/SceneDetails/RatingStars";
 import { useFormik } from "formik";
 import { Prompt } from "react-router-dom";
@@ -67,11 +67,6 @@ export const MovieEditPanel: React.FC<IMovieEditPanel> = ({
     GQL.ScrapedMovie | undefined
   >();
 
-  const labelXS = 3;
-  const labelXL = 3;
-  const fieldXS = 9;
-  const fieldXL = 9;
-
   const schema = yup.object({
     name: yup.string().required(),
     aliases: yup.string().optional().nullable(),
@@ -362,10 +357,10 @@ export const MovieEditPanel: React.FC<IMovieEditPanel> = ({
   function renderTextField(field: string, title: string) {
     return (
       <Form.Group controlId={field} as={Row}>
-        <Form.Label column xs={labelXS} xl={labelXL}>
-          {title}
-        </Form.Label>
-        <Col xs={fieldXS} xl={fieldXL}>
+        {FormUtils.renderLabel({
+          title,
+        })}
+        <Col xs={9}>
           <Form.Control
             className="text-input"
             placeholder={title}
@@ -396,10 +391,10 @@ export const MovieEditPanel: React.FC<IMovieEditPanel> = ({
 
       <Form noValidate onSubmit={formik.handleSubmit} id="movie-edit">
         <Form.Group controlId="name" as={Row}>
-          <Form.Label column xs={labelXS} xl={labelXL}>
-            {intl.formatMessage({ id: "name" })}
-          </Form.Label>
-          <Col xs={fieldXS} xl={fieldXL}>
+          {FormUtils.renderLabel({
+            title: intl.formatMessage({ id: "name" }),
+          })}
+          <Col xs={9}>
             <Form.Control
               className="text-input"
               placeholder={intl.formatMessage({ id: "name" })}
@@ -415,10 +410,10 @@ export const MovieEditPanel: React.FC<IMovieEditPanel> = ({
         {renderTextField("aliases", intl.formatMessage({ id: "aliases" }))}
 
         <Form.Group controlId="duration" as={Row}>
-          <Form.Label column sm={labelXS} xl={labelXL}>
-            {intl.formatMessage({ id: "duration" })}
-          </Form.Label>
-          <Col sm={fieldXS} xl={fieldXL}>
+          {FormUtils.renderLabel({
+            title: intl.formatMessage({ id: "duration" }),
+          })}
+          <Col xs={9}>
             <DurationInput
               numericValue={formik.values.duration ?? undefined}
               onValueChange={(valueAsNumber: number) => {
@@ -431,10 +426,10 @@ export const MovieEditPanel: React.FC<IMovieEditPanel> = ({
         {renderTextField("date", intl.formatMessage({ id: "date" }))}
 
         <Form.Group controlId="studio" as={Row}>
-          <Form.Label column sm={labelXS} xl={labelXL}>
-            {intl.formatMessage({ id: "studio" })}
-          </Form.Label>
-          <Col sm={fieldXS} xl={fieldXL}>
+          {FormUtils.renderLabel({
+            title: intl.formatMessage({ id: "studio" }),
+          })}
+          <Col xs={9}>
             <StudioSelect
               onSelect={(items) =>
                 formik.setFieldValue(
@@ -450,10 +445,10 @@ export const MovieEditPanel: React.FC<IMovieEditPanel> = ({
         {renderTextField("director", intl.formatMessage({ id: "director" }))}
 
         <Form.Group controlId="rating" as={Row}>
-          <Form.Label column sm={labelXS} xl={labelXL}>
-            {intl.formatMessage({ id: "rating" })}
-          </Form.Label>
-          <Col sm={fieldXS} xl={fieldXL}>
+          {FormUtils.renderLabel({
+            title: intl.formatMessage({ id: "rating" }),
+          })}
+          <Col xs={9}>
             <RatingStars
               value={formik.values.rating ?? undefined}
               onSetRating={(value) =>
@@ -464,10 +459,10 @@ export const MovieEditPanel: React.FC<IMovieEditPanel> = ({
         </Form.Group>
 
         <Form.Group controlId="url" as={Row}>
-          <Form.Label column xs={labelXS} xl={labelXL}>
-            {intl.formatMessage({ id: "url" })}
-          </Form.Label>
-          <Col xs={fieldXS} xl={fieldXL}>
+          {FormUtils.renderLabel({
+            title: intl.formatMessage({ id: "url" }),
+          })}
+          <Col xs={9}>
             <InputGroup>
               <Form.Control
                 className="text-input"
@@ -480,10 +475,10 @@ export const MovieEditPanel: React.FC<IMovieEditPanel> = ({
         </Form.Group>
 
         <Form.Group controlId="synopsis" as={Row}>
-          <Form.Label column sm={labelXS} xl={labelXL}>
-            {intl.formatMessage({ id: "synopsis" })}
-          </Form.Label>
-          <Col sm={fieldXS} xl={fieldXL}>
+          {FormUtils.renderLabel({
+            title: intl.formatMessage({ id: "synopsis" }),
+          })}
+          <Col xs={9}>
             <Form.Control
               as="textarea"
               className="text-input"
diff --git a/ui/v2.5/src/components/Shared/DetailsEditNavbar.tsx b/ui/v2.5/src/components/Shared/DetailsEditNavbar.tsx
index 999e5c728..0134e91a1 100644
--- a/ui/v2.5/src/components/Shared/DetailsEditNavbar.tsx
+++ b/ui/v2.5/src/components/Shared/DetailsEditNavbar.tsx
@@ -61,7 +61,7 @@ export const DetailsEditNavbar: React.FC<IProps> = (props: IProps) => {
     return (
       <Button
         variant="danger"
-        className="delete d-none d-sm-block"
+        className="delete"
         onClick={() => setIsDeleteAlertOpen(true)}
       >
         <FormattedMessage id="actions.delete" />
diff --git a/ui/v2.5/src/components/Studios/StudioDetails/Studio.tsx b/ui/v2.5/src/components/Studios/StudioDetails/Studio.tsx
index 9f246165c..c6042eb0d 100644
--- a/ui/v2.5/src/components/Studios/StudioDetails/Studio.tsx
+++ b/ui/v2.5/src/components/Studios/StudioDetails/Studio.tsx
@@ -356,7 +356,7 @@ export const Studio: React.FC = () => {
       <div
         className={cx("studio-details", {
           "col-md-4": !isNew,
-          "col-8": isNew,
+          "col-md-8": isNew,
         })}
       >
         {isNew && (
diff --git a/ui/v2.5/src/components/Tags/TagDetails/Tag.tsx b/ui/v2.5/src/components/Tags/TagDetails/Tag.tsx
index b08296978..923e82393 100644
--- a/ui/v2.5/src/components/Tags/TagDetails/Tag.tsx
+++ b/ui/v2.5/src/components/Tags/TagDetails/Tag.tsx
@@ -259,7 +259,7 @@ export const Tag: React.FC = () => {
       <div
         className={cx("tag-details", {
           "col-md-4": !isNew,
-          "col-8": isNew,
+          "col-md-8": isNew,
         })}
       >
         <div className="text-center logo-container">