From 9db5773cb9680404431efc5b24ac5a5cd4ac48a4 Mon Sep 17 00:00:00 2001
From: grafixeyehero <32230989+grafixeyehero@users.noreply.github.com>
Date: Tue, 19 Oct 2021 19:19:28 +0300
Subject: [PATCH] rebase

---
 .../SectionTitleLinkElement.tsx               | 34 -------------------
 .../users}/ButtonElement.tsx                  |  2 +-
 .../users}/CheckBoxElement.tsx                |  2 +-
 .../users}/InputElement.tsx                   |  2 +-
 .../users/NewUserChannelAccessList.tsx}       |  4 +--
 .../users/NewUserFolderAccessList.tsx}        |  4 +--
 .../users/SectionTitleLinkElement.tsx         |  2 +-
 src/components/pages/NewUserPage.tsx          | 16 ++++-----
 8 files changed, 16 insertions(+), 50 deletions(-)
 delete mode 100644 src/components/DashboardComponent/users/ElementComponent/SectionTitleLinkElement.tsx
 rename src/components/{DashboardComponent/users/ElementComponent => dashboard/users}/ButtonElement.tsx (92%)
 rename src/components/{DashboardComponent/users/ElementComponent => dashboard/users}/CheckBoxElement.tsx (93%)
 rename src/components/{DashboardComponent/users/ElementComponent => dashboard/users}/InputElement.tsx (93%)
 rename src/components/{DashboardComponent/users/NewUserPage/ChannelAccess.tsx => dashboard/users/NewUserChannelAccessList.tsx} (80%)
 rename src/components/{DashboardComponent/users/NewUserPage/FolderAccess.tsx => dashboard/users/NewUserFolderAccessList.tsx} (80%)

diff --git a/src/components/DashboardComponent/users/ElementComponent/SectionTitleLinkElement.tsx b/src/components/DashboardComponent/users/ElementComponent/SectionTitleLinkElement.tsx
deleted file mode 100644
index 68dc56579..000000000
--- a/src/components/DashboardComponent/users/ElementComponent/SectionTitleLinkElement.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import React, { FunctionComponent } from 'react';
-import globalize from '../../../../scripts/globalize';
-
-const createLinkElement = ({ className, title, href }) => ({
-    __html: `<a
-        is="emby-linkbutton"
-        rel="noopener noreferrer"
-        class="${className}"
-        target="_blank"
-        href="${href}"
-        >
-        ${title}
-    </a>`
-});
-
-type IProps = {
-    title?: string;
-    className?: string;
-    url?: string
-}
-
-const SectionTitleLinkElement: FunctionComponent<IProps> = ({ className, title, url }: IProps) => {
-    return (
-        <div
-            dangerouslySetInnerHTML={createLinkElement({
-                className: className,
-                title: globalize.translate(title),
-                href: url
-            })}
-        />
-    );
-};
-
-export default SectionTitleLinkElement;
diff --git a/src/components/DashboardComponent/users/ElementComponent/ButtonElement.tsx b/src/components/dashboard/users/ButtonElement.tsx
similarity index 92%
rename from src/components/DashboardComponent/users/ElementComponent/ButtonElement.tsx
rename to src/components/dashboard/users/ButtonElement.tsx
index 14a9ecb1e..dfde8c739 100644
--- a/src/components/DashboardComponent/users/ElementComponent/ButtonElement.tsx
+++ b/src/components/dashboard/users/ButtonElement.tsx
@@ -1,5 +1,5 @@
 import React, { FunctionComponent } from 'react';
-import globalize from '../../../../scripts/globalize';
+import globalize from '../../../scripts/globalize';
 
 const createButtonElement = ({ type, className, title }) => ({
     __html: `<button
diff --git a/src/components/DashboardComponent/users/ElementComponent/CheckBoxElement.tsx b/src/components/dashboard/users/CheckBoxElement.tsx
similarity index 93%
rename from src/components/DashboardComponent/users/ElementComponent/CheckBoxElement.tsx
rename to src/components/dashboard/users/CheckBoxElement.tsx
index 27ed0c0eb..aaa5c63f5 100644
--- a/src/components/DashboardComponent/users/ElementComponent/CheckBoxElement.tsx
+++ b/src/components/dashboard/users/CheckBoxElement.tsx
@@ -1,5 +1,5 @@
 import React, { FunctionComponent } from 'react';
-import globalize from '../../../../scripts/globalize';
+import globalize from '../../../scripts/globalize';
 
 const createCheckBoxElement = ({ type, className, title }) => ({
     __html: `<label>
diff --git a/src/components/DashboardComponent/users/ElementComponent/InputElement.tsx b/src/components/dashboard/users/InputElement.tsx
similarity index 93%
rename from src/components/DashboardComponent/users/ElementComponent/InputElement.tsx
rename to src/components/dashboard/users/InputElement.tsx
index 127a633c6..5ece3ac0b 100644
--- a/src/components/DashboardComponent/users/ElementComponent/InputElement.tsx
+++ b/src/components/dashboard/users/InputElement.tsx
@@ -1,5 +1,5 @@
 import React, { FunctionComponent } from 'react';
-import globalize from '../../../../scripts/globalize';
+import globalize from '../../../scripts/globalize';
 
 const createInputElement = ({ type, id, label, options }) => ({
     __html: `<input
diff --git a/src/components/DashboardComponent/users/NewUserPage/ChannelAccess.tsx b/src/components/dashboard/users/NewUserChannelAccessList.tsx
similarity index 80%
rename from src/components/DashboardComponent/users/NewUserPage/ChannelAccess.tsx
rename to src/components/dashboard/users/NewUserChannelAccessList.tsx
index 08ac85996..7e83d7ad0 100644
--- a/src/components/DashboardComponent/users/NewUserPage/ChannelAccess.tsx
+++ b/src/components/dashboard/users/NewUserChannelAccessList.tsx
@@ -17,7 +17,7 @@ type IProps = {
     Id?: string;
 }
 
-const ChannelAccess: FunctionComponent<IProps> = ({Name, Id}: IProps) => {
+const NewUserChannelAccessList: FunctionComponent<IProps> = ({Name, Id}: IProps) => {
     return (
         <div
             dangerouslySetInnerHTML={createCheckBoxElement({
@@ -28,5 +28,5 @@ const ChannelAccess: FunctionComponent<IProps> = ({Name, Id}: IProps) => {
     );
 };
 
-export default ChannelAccess;
+export default NewUserChannelAccessList;
 
diff --git a/src/components/DashboardComponent/users/NewUserPage/FolderAccess.tsx b/src/components/dashboard/users/NewUserFolderAccessList.tsx
similarity index 80%
rename from src/components/DashboardComponent/users/NewUserPage/FolderAccess.tsx
rename to src/components/dashboard/users/NewUserFolderAccessList.tsx
index d5371ee8f..378475cb7 100644
--- a/src/components/DashboardComponent/users/NewUserPage/FolderAccess.tsx
+++ b/src/components/dashboard/users/NewUserFolderAccessList.tsx
@@ -17,7 +17,7 @@ type IProps = {
     Id?: string;
 }
 
-const FolderAccess: FunctionComponent<IProps> = ({Name, Id}: IProps) => {
+const NewUserFolderAccessList: FunctionComponent<IProps> = ({Name, Id}: IProps) => {
     return (
         <div
             dangerouslySetInnerHTML={createCheckBoxElement({
@@ -28,5 +28,5 @@ const FolderAccess: FunctionComponent<IProps> = ({Name, Id}: IProps) => {
     );
 };
 
-export default FolderAccess;
+export default NewUserFolderAccessList;
 
diff --git a/src/components/dashboard/users/SectionTitleLinkElement.tsx b/src/components/dashboard/users/SectionTitleLinkElement.tsx
index 98c12c3c2..ee1f8125c 100644
--- a/src/components/dashboard/users/SectionTitleLinkElement.tsx
+++ b/src/components/dashboard/users/SectionTitleLinkElement.tsx
@@ -1,7 +1,7 @@
 import React, { FunctionComponent } from 'react';
 import globalize from '../../../scripts/globalize';
 
-const createLinkElement = ({ className, href, title }) => ({
+const createLinkElement = ({ className, title, href }) => ({
     __html: `<a
         is="emby-linkbutton"
         rel="noopener noreferrer"
diff --git a/src/components/pages/NewUserPage.tsx b/src/components/pages/NewUserPage.tsx
index dc857ed27..aa56df0bd 100644
--- a/src/components/pages/NewUserPage.tsx
+++ b/src/components/pages/NewUserPage.tsx
@@ -5,12 +5,12 @@ import globalize from '../../scripts/globalize';
 import loading from '../loading/loading';
 import toast from '../toast/toast';
 
-import SectionTitleLinkElement from '../DashboardComponent/users/ElementComponent/SectionTitleLinkElement';
-import InputElement from '../DashboardComponent/users/ElementComponent/InputElement';
-import CheckBoxElement from '../DashboardComponent/users/ElementComponent/CheckBoxElement';
-import FolderAccess from '../DashboardComponent/users/NewUserPage/FolderAccess';
-import ChannelAccess from '../DashboardComponent/users/NewUserPage/ChannelAccess';
-import ButtonElement from '../DashboardComponent/users/ElementComponent/ButtonElement';
+import SectionTitleLinkElement from '../dashboard/users/SectionTitleLinkElement';
+import InputElement from '../dashboard/users/InputElement';
+import CheckBoxElement from '../dashboard/users/CheckBoxElement';
+import NewUserFolderAccessList from '../dashboard/users/NewUserFolderAccessList';
+import NewUserChannelAccessList from '../dashboard/users/NewUserChannelAccessList';
+import ButtonElement from '../dashboard/users/ButtonElement';
 
 type userInput = {
     Name?: string;
@@ -180,7 +180,7 @@ const NewUserPage: FunctionComponent = () => {
                                 </h3>
                                 <div className='checkboxList paperList' style={{padding: '.5em 1em'}}>
                                     {mediaFoldersResult.map(folder => (
-                                        <FolderAccess
+                                        <NewUserFolderAccessList
                                             key={folder.Id}
                                             Id={folder.Id}
                                             Name={folder.Name}
@@ -207,7 +207,7 @@ const NewUserPage: FunctionComponent = () => {
                                 </h3>
                                 <div className='checkboxList paperList' style={{padding: '.5em 1em'}}>
                                     {channelsResult.map(folder => (
-                                        <ChannelAccess
+                                        <NewUserChannelAccessList
                                             key={folder.Id}
                                             Id={folder.Id}
                                             Name={folder.Name}