From a359672ebafffef742858814f0faa918e0341aa3 Mon Sep 17 00:00:00 2001
From: sct <sctsnipe@gmail.com>
Date: Tue, 24 Nov 2020 15:51:56 +0000
Subject: [PATCH] feat: add application url config to main settings ui

---
 overseerr-api.yml                             |   6 +-
 server/routes/settings.ts                     |   3 +-
 src/components/Settings/SettingsMain.tsx      | 140 +++++++++++++-----
 .../Settings/SettingsNotifications.tsx        |   9 ++
 4 files changed, 120 insertions(+), 38 deletions(-)

diff --git a/overseerr-api.yml b/overseerr-api.yml
index 9921e09f..667f4508 100644
--- a/overseerr-api.yml
+++ b/overseerr-api.yml
@@ -54,8 +54,10 @@ components:
         apiKey:
           type: string
           example: 'anapikey'
-      required:
-        - apiKey
+          readOnly: true
+        applicationUrl:
+          type: string
+          example: https://os.example.com
     PlexLibrary:
       type: object
       properties:
diff --git a/server/routes/settings.ts b/server/routes/settings.ts
index fe082600..424bb4dc 100644
--- a/server/routes/settings.ts
+++ b/server/routes/settings.ts
@@ -15,6 +15,7 @@ import logger from '../logger';
 import { scheduledJobs } from '../job/schedule';
 import { Permission } from '../lib/permissions';
 import { isAuthenticated } from '../middleware/auth';
+import { merge } from 'lodash';
 
 const settingsRoutes = Router();
 
@@ -27,7 +28,7 @@ settingsRoutes.get('/main', (_req, res) => {
 settingsRoutes.post('/main', (req, res) => {
   const settings = getSettings();
 
-  settings.main = req.body;
+  settings.main = merge(settings.main, req.body);
   settings.save();
 
   return res.status(200).json(settings.main);
diff --git a/src/components/Settings/SettingsMain.tsx b/src/components/Settings/SettingsMain.tsx
index 6eeb19da..cf009798 100644
--- a/src/components/Settings/SettingsMain.tsx
+++ b/src/components/Settings/SettingsMain.tsx
@@ -3,9 +3,21 @@ import useSWR from 'swr';
 import LoadingSpinner from '../Common/LoadingSpinner';
 import type { MainSettings } from '../../../server/lib/settings';
 import CopyButton from './CopyButton';
+import { Form, Formik, Field } from 'formik';
+import axios from 'axios';
+import Button from '../Common/Button';
+import { defineMessages, useIntl } from 'react-intl';
+
+const messages = defineMessages({
+  save: 'Save Changes',
+  saving: 'Saving...',
+});
 
 const SettingsMain: React.FC = () => {
-  const { data, error } = useSWR<MainSettings>('/api/v1/settings/main');
+  const intl = useIntl();
+  const { data, error, revalidate } = useSWR<MainSettings>(
+    '/api/v1/settings/main'
+  );
 
   if (!data && !error) {
     return <LoadingSpinner />;
@@ -22,40 +34,98 @@ const SettingsMain: React.FC = () => {
         </p>
       </div>
       <div className="mt-6 sm:mt-5">
-        <div className="sm:grid sm:grid-cols-3 sm:gap-4 sm:items-start sm:border-t sm:border-gray-800 sm:pt-5">
-          <label
-            htmlFor="username"
-            className="block text-sm font-medium leading-5 text-gray-400 sm:mt-px sm:pt-2"
-          >
-            API Key
-          </label>
-          <div className="mt-1 sm:mt-0 sm:col-span-2">
-            <div className="max-w-lg flex rounded-md shadow-sm">
-              <input
-                type="text"
-                id="username"
-                className="flex-1 form-input block w-full min-w-0 rounded-none rounded-l-md transition duration-150 ease-in-out sm:text-sm sm:leading-5 bg-gray-700 border border-gray-500"
-                value={data?.apiKey}
-                readOnly
-              />
-              <CopyButton textToCopy={data?.apiKey ?? ''} />
-              <button className="-ml-px relative inline-flex items-center px-4 py-2 border border-gray-500 text-sm leading-5 font-medium rounded-r-md text-white bg-indigo-500  hover:bg-indigo-400 focus:outline-none focus:ring-blue focus:border-blue-300 active:bg-gray-100 active:text-gray-700 transition ease-in-out duration-150">
-                <svg
-                  className="w-5 h-5"
-                  fill="currentColor"
-                  viewBox="0 0 20 20"
-                  xmlns="http://www.w3.org/2000/svg"
-                >
-                  <path
-                    fillRule="evenodd"
-                    d="M4 2a1 1 0 011 1v2.101a7.002 7.002 0 0111.601 2.566 1 1 0 11-1.885.666A5.002 5.002 0 005.999 7H9a1 1 0 010 2H4a1 1 0 01-1-1V3a1 1 0 011-1zm.008 9.057a1 1 0 011.276.61A5.002 5.002 0 0014.001 13H11a1 1 0 110-2h5a1 1 0 011 1v5a1 1 0 11-2 0v-2.101a7.002 7.002 0 01-11.601-2.566 1 1 0 01.61-1.276z"
-                    clipRule="evenodd"
-                  />
-                </svg>
-              </button>
-            </div>
-          </div>
-        </div>
+        <Formik
+          initialValues={{
+            apiKey: data?.apiKey,
+            applicationUrl: data?.applicationUrl,
+          }}
+          onSubmit={async (values) => {
+            try {
+              await axios.post('/api/v1/settings/main', {
+                applicationUrl: values.applicationUrl,
+              });
+            } catch (e) {
+              // TODO show error
+            } finally {
+              revalidate();
+            }
+          }}
+        >
+          {({ errors, touched, isSubmitting }) => {
+            return (
+              <Form>
+                <div className="sm:grid sm:grid-cols-3 sm:gap-4 sm:items-start sm:border-t sm:border-gray-800 sm:pt-5">
+                  <label
+                    htmlFor="username"
+                    className="block text-sm font-medium leading-5 text-gray-400 sm:mt-px sm:pt-2"
+                  >
+                    API Key
+                  </label>
+                  <div className="mt-1 sm:mt-0 sm:col-span-2">
+                    <div className="max-w-lg flex rounded-md shadow-sm">
+                      <input
+                        type="text"
+                        id="username"
+                        className="flex-1 form-input block w-full min-w-0 rounded-none rounded-l-md transition duration-150 ease-in-out sm:text-sm sm:leading-5 bg-gray-700 border border-gray-500"
+                        value={data?.apiKey}
+                        readOnly
+                      />
+                      <CopyButton textToCopy={data?.apiKey ?? ''} />
+                      <button className="-ml-px relative inline-flex items-center px-4 py-2 border border-gray-500 text-sm leading-5 font-medium rounded-r-md text-white bg-indigo-500  hover:bg-indigo-400 focus:outline-none focus:ring-blue focus:border-blue-300 active:bg-gray-100 active:text-gray-700 transition ease-in-out duration-150">
+                        <svg
+                          className="w-5 h-5"
+                          fill="currentColor"
+                          viewBox="0 0 20 20"
+                          xmlns="http://www.w3.org/2000/svg"
+                        >
+                          <path
+                            fillRule="evenodd"
+                            d="M4 2a1 1 0 011 1v2.101a7.002 7.002 0 0111.601 2.566 1 1 0 11-1.885.666A5.002 5.002 0 005.999 7H9a1 1 0 010 2H4a1 1 0 01-1-1V3a1 1 0 011-1zm.008 9.057a1 1 0 011.276.61A5.002 5.002 0 0014.001 13H11a1 1 0 110-2h5a1 1 0 011 1v5a1 1 0 11-2 0v-2.101a7.002 7.002 0 01-11.601-2.566 1 1 0 01.61-1.276z"
+                            clipRule="evenodd"
+                          />
+                        </svg>
+                      </button>
+                    </div>
+                  </div>
+                </div>
+                <div className="mt-6 sm:mt-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:items-start sm:border-t sm:border-gray-800 sm:pt-5">
+                  <label
+                    htmlFor="name"
+                    className="block text-sm font-medium leading-5 text-gray-400 sm:mt-px sm:pt-2"
+                  >
+                    Application URL
+                  </label>
+                  <div className="mt-1 sm:mt-0 sm:col-span-2">
+                    <div className="max-w-lg flex rounded-md shadow-sm">
+                      <Field
+                        id="applicationUrl"
+                        name="applicationUrl"
+                        type="text"
+                        placeholder="https://os.example.com"
+                        className="flex-1 form-input block w-full min-w-0 rounded-md transition duration-150 ease-in-out sm:text-sm sm:leading-5 bg-gray-700 border border-gray-500"
+                      />
+                    </div>
+                  </div>
+                </div>
+                <div className="mt-8 border-t border-gray-700 pt-5">
+                  <div className="flex justify-end">
+                    <span className="ml-3 inline-flex rounded-md shadow-sm">
+                      <Button
+                        buttonType="primary"
+                        type="submit"
+                        disabled={isSubmitting}
+                      >
+                        {isSubmitting
+                          ? intl.formatMessage(messages.saving)
+                          : intl.formatMessage(messages.save)}
+                      </Button>
+                    </span>
+                  </div>
+                </div>
+              </Form>
+            );
+          }}
+        </Formik>
       </div>
     </>
   );
diff --git a/src/components/Settings/SettingsNotifications.tsx b/src/components/Settings/SettingsNotifications.tsx
index 7b06772f..9c54d4f6 100644
--- a/src/components/Settings/SettingsNotifications.tsx
+++ b/src/components/Settings/SettingsNotifications.tsx
@@ -53,6 +53,15 @@ const SettingsNotifications: React.FC = ({ children }) => {
 
   return (
     <>
+      <div className="mb-6">
+        <h3 className="text-lg leading-6 font-medium text-gray-200">
+          Notification Settings
+        </h3>
+        <p className="mt-1 max-w-2xl text-sm leading-5 text-gray-500">
+          Here you can pick and choose what types of notifications to send and
+          through what types of services.
+        </p>
+      </div>
       <div>
         <div className="sm:hidden">
           <label htmlFor="tabs" className="sr-only">