From 959f5d0642e40f4c4e05dd7f0afc5cb41b160819 Mon Sep 17 00:00:00 2001
From: gtzatchkova <guergana.tzatchkova@wikimedia.de>
Date: Wed, 30 Oct 2024 21:07:17 +0100
Subject: [PATCH 01/14] Add hover states for buttons

---
 client/components/Application/Content.tsx        |  9 ++++++++-
 client/components/Application/Sidebar.tsx        | 11 ++++++++++-
 client/components/Parts/Buttons/SimpleButton.tsx |  7 +++++--
 client/components/Parts/Dialogs/OneButton.tsx    |  1 +
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/client/components/Application/Content.tsx b/client/components/Application/Content.tsx
index 12a69b656..c999eed72 100644
--- a/client/components/Application/Content.tsx
+++ b/client/components/Application/Content.tsx
@@ -88,7 +88,14 @@ function EmptyContent() {
           The ODE supports Excel & csv files
         </Typography>
         <Button
-          sx={{ my: 0.5, width: '236px', textTransform: 'none' }}
+          sx={{
+            my: 0.5,
+            width: '236px',
+            textTransform: 'none',
+            '&:hover': {
+              backgroundColor: (theme) => theme.palette.OKFNBlue.main,
+            },
+          }}
           variant="contained"
           aria-label="accept"
           onClick={() => store.openDialog('fileUpload')}
diff --git a/client/components/Application/Sidebar.tsx b/client/components/Application/Sidebar.tsx
index 5e1b6c0ea..006602e38 100644
--- a/client/components/Application/Sidebar.tsx
+++ b/client/components/Application/Sidebar.tsx
@@ -21,7 +21,16 @@ export default function Sidebar() {
       </Box>
       <Button
         variant="outlined"
-        sx={{ textTransform: 'none', marginBottom: '22px', mx: '24px' }}
+        sx={{
+          textTransform: 'none',
+          marginBottom: '22px',
+          mx: '24px',
+          '&:hover': {
+            color: 'white',
+            borderColor: (theme) => theme.palette.OKFNBlue.main,
+            backgroundColor: (theme) => theme.palette.OKFNBlue.main,
+          },
+        }}
         onClick={() => store.openDialog('fileUpload')}
       >
         Upload your data
diff --git a/client/components/Parts/Buttons/SimpleButton.tsx b/client/components/Parts/Buttons/SimpleButton.tsx
index d5e4449c7..b43e46ccf 100644
--- a/client/components/Parts/Buttons/SimpleButton.tsx
+++ b/client/components/Parts/Buttons/SimpleButton.tsx
@@ -4,10 +4,11 @@ import Button, { ButtonProps } from '@mui/material/Button'
 interface SimpleButtonProps extends ButtonProps {
   label?: string
   small?: boolean
+  hoverBgColor?: string
 }
 
 export default function SimpleButton(props: SimpleButtonProps) {
-  const { label, ...others } = props
+  const { label, hoverBgColor, ...others } = props
 
   const buttonTextColor = props.color === 'OKFNWhite' ? 'gray': 'white'
   return (
@@ -15,7 +16,9 @@ export default function SimpleButton(props: SimpleButtonProps) {
       fullWidth={!props.small}
       color={props.color}
       {...others}
-      sx={{ padding: '14px 24px', borderRadius: '9px', border: props.label === 'Cancel' ? '1px solid #D3D7D8' : 0, boxShadow: 'none' }}
+      sx={{ padding: '14px 24px', borderRadius: '9px', border: props.label === 'Cancel' ? '1px solid #D3D7D8' : 0, boxShadow: 'none', '&:hover': {
+        backgroundColor: (theme) => hoverBgColor === 'OKFNBlue' ? theme.palette.OKFNBlue.main : 'unset'
+      } }}
     >
       {(
         <Typography sx={{ textTransform: 'capitalize', fontWeight: 700, color: (theme) => props.disabled ? theme.palette.OKFNGray700.main : buttonTextColor, }}>
diff --git a/client/components/Parts/Dialogs/OneButton.tsx b/client/components/Parts/Dialogs/OneButton.tsx
index b5691aa50..940a4eb2d 100644
--- a/client/components/Parts/Dialogs/OneButton.tsx
+++ b/client/components/Parts/Dialogs/OneButton.tsx
@@ -90,6 +90,7 @@ export default function OneButtonDialog(props: OneButtonDialogProps) {
           onClick={handleConfirm}
           aria-label="accept"
           variant="contained"
+          hoverBgColor='OKFNBlue'
           color={ props.label === 'Delete' ? 'OKFNRed500' : 'OKFNBlack' }
           disabled={props.disabled || props.loading}
         />

From 9b2332f2d2414892601822e867bfdc6a01e0ff83 Mon Sep 17 00:00:00 2001
From: gtzatchkova <guergana.tzatchkova@wikimedia.de>
Date: Thu, 31 Oct 2024 16:32:48 +0100
Subject: [PATCH 02/14] Adjust styles for Publish, Save changes, Upload data
 buttons

Also welcomeBanner and FileUpload
---
 client/components/Application/Content.tsx            |  1 +
 client/components/Application/Dialogs/FileUpload.tsx |  2 ++
 .../components/Application/Dialogs/WelcomeBanner.tsx |  7 +++++--
 client/components/Parts/Bars/Action.tsx              | 12 ++++++++----
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/client/components/Application/Content.tsx b/client/components/Application/Content.tsx
index c999eed72..0d3c89f44 100644
--- a/client/components/Application/Content.tsx
+++ b/client/components/Application/Content.tsx
@@ -92,6 +92,7 @@ function EmptyContent() {
             my: 0.5,
             width: '236px',
             textTransform: 'none',
+            backgroundColor: (theme) => theme.palette.OKFNBlack.main,
             '&:hover': {
               backgroundColor: (theme) => theme.palette.OKFNBlue.main,
             },
diff --git a/client/components/Application/Dialogs/FileUpload.tsx b/client/components/Application/Dialogs/FileUpload.tsx
index 0e2f14b1c..1020c5d33 100644
--- a/client/components/Application/Dialogs/FileUpload.tsx
+++ b/client/components/Application/Dialogs/FileUpload.tsx
@@ -211,6 +211,8 @@ export default function FileUploadDialog() {
                 sx={{ my: 0.5, marginTop: '53px' }}
                 variant="contained"
                 aria-label="accept"
+                hoverBgColor="OKFNBlue"
+                color="OKFNBlack"
                 disabled={!remoteUrlValue}
                 onClick={() => onAddRemoteConfirm(remoteUrlValue)}
               />
diff --git a/client/components/Application/Dialogs/WelcomeBanner.tsx b/client/components/Application/Dialogs/WelcomeBanner.tsx
index 835324abd..1350196e7 100644
--- a/client/components/Application/Dialogs/WelcomeBanner.tsx
+++ b/client/components/Application/Dialogs/WelcomeBanner.tsx
@@ -8,6 +8,7 @@ import * as store from '@client/store'
 import * as React from 'react'
 import welcomescreenImg from './assets/welcomescreen.png'
 import { styled } from '@mui/material/styles'
+import { useTheme } from '@mui/material/styles'
 
 export default function WelcomeBanner() {
   const hideWelcomeScreen = store.useStore((state) => state.hideWelcomeScreen)
@@ -23,15 +24,17 @@ export default function WelcomeBanner() {
     store.closeDialog()
   }
 
+  const theme = useTheme()
+
   const StyledButton = styled(SimpleButton)({
     boxShadow: 'none',
     textTransform: 'none',
     fontSize: 16,
     padding: '18px 0',
     lineHeight: 1.5,
-    backgroundColor: '#00D1FF',
+    backgroundColor: theme.palette.OKFNBlack.main,
     '&:hover': {
-      backgroundColor: '#11E2FF',
+      backgroundColor: theme.palette.OKFNBlue.main,
     },
     '&:active': {
       boxShadow: 'none',
diff --git a/client/components/Parts/Bars/Action.tsx b/client/components/Parts/Bars/Action.tsx
index 53ce2f68e..1fe7644e3 100644
--- a/client/components/Parts/Bars/Action.tsx
+++ b/client/components/Parts/Bars/Action.tsx
@@ -72,11 +72,13 @@ export function PublishButton(props: ButtonProps) {
       <IconButton
         label={props.label || 'Publish'}
         Icon={ElectricBoltIcon}
-        variant="outlined"
+        variant={!props.disabled ? 'contained' : 'outlined'}
         disabled={props.disabled}
         onClick={() => onClick()}
-        sx={{ backgroundColor: 'white', textTransform: 'none', color: (theme) => theme.palette.OKFNCoolGray.main, borderColor: (theme) => theme.palette.OKFNCoolGray.main, '&:hover': {
-          borderColor: (theme) => theme.palette.OKFNCoolGray.main
+        sx={{ backgroundColor: (theme) => props.disabled ? 'white' : theme.palette.OKFNBlack.main, textTransform: 'none', color: (theme) => theme.palette.OKFNWhite.main, '&:hover': {
+          color: (theme) => theme.palette.OKFNWhite.main,
+          borderColor: (theme) => theme.palette.OKFNBlue.main,
+          backgroundColor: (theme) => theme.palette.OKFNBlue.main
         }  }}
       />
     </Box>
@@ -122,7 +124,9 @@ export function SaveButton(props: ButtonProps) {
         variant={props.updated ? 'contained' : 'outlined'}
         disabled={!props.updated}
         onClick={() => onClick()}
-        sx={{ backgroundColor: !props.updated ? 'white' : undefined, textTransform: 'none' }}
+        sx={{ backgroundColor: (theme) => !props.updated ? 'white' :  theme.palette.OKFNBlack.main, '&:hover': {
+          backgroundColor: (theme) => theme.palette.OKFNBlue.main
+        }, textTransform: 'none' }}
       />
     </Box>
   )

From 58e84c32445b2aae950884cd98841a46248b687f Mon Sep 17 00:00:00 2001
From: gtzatchkova <guergana.tzatchkova@wikimedia.de>
Date: Thu, 31 Oct 2024 16:46:29 +0100
Subject: [PATCH 03/14] Add blue background to two buttons dialogs

---
 client/components/Parts/Dialogs/TwoButton.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/components/Parts/Dialogs/TwoButton.tsx b/client/components/Parts/Dialogs/TwoButton.tsx
index 7f34f8b27..c40744c8c 100644
--- a/client/components/Parts/Dialogs/TwoButton.tsx
+++ b/client/components/Parts/Dialogs/TwoButton.tsx
@@ -104,6 +104,7 @@ export default function TwoButtonDialog(props: TwoButtonDialogProps) {
             onClick={handleConfirm}
             aria-label="accept"
             variant="contained"
+            hoverBgColor='OKFNBlue'
             color={ props.label === 'Delete' ? 'OKFNRed500' : 'OKFNBlack' }
             disabled={props.disabled || props.loading}
           />

From 1c73fd87169a10dc25e6efa5054e13797d849a92 Mon Sep 17 00:00:00 2001
From: Patricio Del Boca <patriciodelboca@gmail.com>
Date: Fri, 1 Nov 2024 08:01:22 +0100
Subject: [PATCH 04/14] 278 - MacOS Notarize (#621)

* 278 - Add MacOS notarize files and secrets

* Fix typo

* Allow notarize in PRs

* Add notarize secrets to the action

* Upgrade electron-builder

* Add some extra resources to the file

* Clean debugging option
---
 .github/workflows/general.yaml |  5 +++++
 electron-builder.yaml          | 10 ++++++++--
 entitlements.mac.plist         | 10 ++++++++++
 package.json                   |  2 +-
 4 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 entitlements.mac.plist

diff --git a/.github/workflows/general.yaml b/.github/workflows/general.yaml
index 9b5e019aa..4ee2a29b8 100644
--- a/.github/workflows/general.yaml
+++ b/.github/workflows/general.yaml
@@ -114,6 +114,11 @@ jobs:
         run: make dist
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          CSC_LINK: ${{ secrets.CSC_LINK }}
+          CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
+          APPLE_ID: ${{ secrets.APPLE_ID }}
+          APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }}
+          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
       - name: Archive build artifacts
         uses: actions/upload-artifact@v4
         with:
diff --git a/electron-builder.yaml b/electron-builder.yaml
index 84a43438a..d186c6cca 100644
--- a/electron-builder.yaml
+++ b/electron-builder.yaml
@@ -26,9 +26,15 @@ linux:
     - deb
 
 # Macos
-
+# Some resources to understand values and github secrets
+# https://kilianvalkhof.com/2019/electron/notarizing-your-electron-application/
+# https://www.electron.build/code-signing
+# https://www.electron.build/app-builder-lib.interface.macconfiguration#notarize
+# https://github.com/electron/notarize
 mac:
-  notarize: false
+  hardenedRuntime: true
+  entitlements: 'entitlements.mac.plist'
+  entitlementsInherit: 'entitlements.mac.plist'
 
 # Windows
 # Variable ${name} doesn't work on windows
diff --git a/entitlements.mac.plist b/entitlements.mac.plist
new file mode 100644
index 000000000..dad3e20e6
--- /dev/null
+++ b/entitlements.mac.plist
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+    <true/>
+    <key>com.apple.security.cs.allow-jit</key>
+    <true/>
+  </dict>
+</plist>
diff --git a/package.json b/package.json
index 59454e1b2..713c3caca 100644
--- a/package.json
+++ b/package.json
@@ -84,7 +84,7 @@
     "delay": "6.0.0",
     "dirty-json": "0.9.2",
     "electron": "31.3.0",
-    "electron-builder": "^24.13.3",
+    "electron-builder": "^25.0.5",
     "electron-updater": "6.2.1",
     "electron-vite": "2.1.0",
     "eslint": "8.45.0",

From da280092a053d525cda0e528f2ac2ebb5e3ca784 Mon Sep 17 00:00:00 2001
From: Guergana Tzatchkova <pestanias@yahoo.com>
Date: Mon, 4 Nov 2024 09:05:06 -0600
Subject: [PATCH 05/14] Add 'Rename' option to file Context menu (#613)

---
 client/assets/rename_icon.svg                 |  5 ++
 client/client.ts                              |  4 +-
 .../components/Application/Buttons/Manage.tsx | 70 -------------------
 client/components/Application/Dialog.tsx      |  6 +-
 .../Application/Dialogs/MoveFile.tsx          | 25 -------
 .../Application/Dialogs/MoveFolder.tsx        | 25 -------
 .../Application/Dialogs/RenameFile.tsx        | 27 +++++++
 client/components/Parts/Trees/File.tsx        | 29 +++++++-
 client/store/actions/file.ts                  | 16 ++---
 client/store/actions/folder.ts                |  4 +-
 client/store/state.ts                         |  3 +-
 11 files changed, 71 insertions(+), 143 deletions(-)
 create mode 100644 client/assets/rename_icon.svg
 delete mode 100644 client/components/Application/Buttons/Manage.tsx
 delete mode 100644 client/components/Application/Dialogs/MoveFile.tsx
 delete mode 100644 client/components/Application/Dialogs/MoveFolder.tsx
 create mode 100644 client/components/Application/Dialogs/RenameFile.tsx

diff --git a/client/assets/rename_icon.svg b/client/assets/rename_icon.svg
new file mode 100644
index 000000000..566af3e96
--- /dev/null
+++ b/client/assets/rename_icon.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.5876 3.07918V3.07918C12.1398 3.6318 12.1398 4.5274 11.5876 5.08001L4.92678 11.7408C4.75585 11.9117 4.54169 12.033 4.30719 12.0916L1.99756 12.6692L2.57513 10.3595C2.63377 10.125 2.75503 9.91088 2.92595 9.73995L9.58739 3.07918C10.1398 2.52699 11.0352 2.52699 11.5876 3.07918Z" stroke="#717879" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10.3343 6.33286L8.3335 4.33203" stroke="#717879" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M14.0026 12.002L13.273 12.7316C12.4671 13.5372 11.1609 13.5372 10.3551 12.7316V12.7316C9.54827 11.9277 8.24332 11.9277 7.43652 12.7316" stroke="#717879" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/client/client.ts b/client/client.ts
index 0fa2579a6..0e8356345 100644
--- a/client/client.ts
+++ b/client/client.ts
@@ -84,7 +84,7 @@ export class Client {
     return await this.request<{ files: types.IFile[] }>('/file/list', props)
   }
 
-  async fileMove(props: { path: string; toPath?: string; deduplicate?: boolean }) {
+  async fileRename(props: { path: string; toPath?: string; deduplicate?: boolean }) {
     return await this.request<{ path: string }>('/file/move', props)
   }
 
@@ -123,7 +123,7 @@ export class Client {
     return await this.request<{ path: string }>('/folder/delete', props)
   }
 
-  async folderMove(props: { path: string; toPath?: string; deduplicate?: boolean }) {
+  async folderRename(props: { path: string; toPath?: string; deduplicate?: boolean }) {
     return await this.request<{ path: string }>('/folder/move', props)
   }
 
diff --git a/client/components/Application/Buttons/Manage.tsx b/client/components/Application/Buttons/Manage.tsx
deleted file mode 100644
index 284035555..000000000
--- a/client/components/Application/Buttons/Manage.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-import CopyIcon from '@mui/icons-material/ContentCopy'
-import MoveIcon from '@mui/icons-material/CopyAll'
-import RuleIcon from '@mui/icons-material/Rule'
-import ManageIcon from '@mui/icons-material/FileCopy'
-import IconButton from '../../Parts/Buttons/Icon'
-import DropdownButton from '../../Parts/Buttons/Dropdown'
-import * as store from '@client/store'
-
-export default function ManageButton() {
-  const path = store.useStore((state) => state.path)
-  const notIndexedFiles = store.useStore(store.getNotIndexedFiles)
-
-  return (
-    <DropdownButton
-      disabled={!path && !notIndexedFiles.length}
-      label="Manage"
-      variant="text"
-      icon={<ManageIcon fontSize="small" sx={{ mr: 1 }} />}
-    >
-      <CopyButton />
-      <MoveButton />
-      <IndexFilesButton />
-    </DropdownButton>
-  )
-}
-
-function CopyButton() {
-  const path = store.useStore((state) => state.path)
-  const isFolder = store.useStore(store.getIsFolder)
-  const type = isFolder ? 'Folder' : 'File'
-
-  return (
-    <IconButton
-      disabled={!path}
-      variant="text"
-      Icon={CopyIcon}
-      label={`Copy ${type}`}
-      onClick={() => store.openDialog(`copy${type}`)}
-    />
-  )
-}
-
-function MoveButton() {
-  const path = store.useStore((state) => state.path)
-  const isFolder = store.useStore(store.getIsFolder)
-  const type = isFolder ? 'Folder' : 'File'
-
-  return (
-    <IconButton
-      disabled={!path}
-      variant="text"
-      Icon={MoveIcon}
-      label={`Move ${type}`}
-      onClick={() => store.openDialog(`move${type}`)}
-    />
-  )
-}
-
-function IndexFilesButton() {
-  const notIndexedFiles = store.useStore(store.getNotIndexedFiles)
-  return (
-    <IconButton
-      disabled={!notIndexedFiles.length}
-      variant="text"
-      label="Index Files"
-      Icon={RuleIcon}
-      onClick={() => store.openDialog('indexFiles')}
-    />
-  )
-}
diff --git a/client/components/Application/Dialog.tsx b/client/components/Application/Dialog.tsx
index ec000ec13..59419d25a 100644
--- a/client/components/Application/Dialog.tsx
+++ b/client/components/Application/Dialog.tsx
@@ -7,13 +7,12 @@ import CopyFolderDialog from './Dialogs/CopyFolder'
 import CreateDialog from './Dialogs/Create'
 import DeleteFilesFoldersDialog from './Dialogs/DeleteFilesFolders'
 import IndexFilesDialog from './Dialogs/IndexFiles'
-import MoveFileDialog from './Dialogs/MoveFile'
-import MoveFolderDialog from './Dialogs/MoveFolder'
 import PublishDialog from './Dialogs/Publish'
 import UnsavedChangesDialog from './Dialogs/UnsavedChanges'
 import WelcomeBannerDialog from './Dialogs/WelcomeBanner'
 import FileUploadDialog from './Dialogs/FileUpload'
 import OpenLocationDialog from './Dialogs/OpenLocation'
+import RenameFileDialog from './Dialogs/RenameFile'
 import * as store from '@client/store'
 
 export default function Dialog() {
@@ -38,11 +37,10 @@ const DIALOGS = {
   create: CreateDialog,
   deleteFilesFolders: DeleteFilesFoldersDialog,
   indexFiles: IndexFilesDialog,
-  moveFile: MoveFileDialog,
-  moveFolder: MoveFolderDialog,
   publish: PublishDialog,
   unsavedChanges: UnsavedChangesDialog,
   welcomeBanner: WelcomeBannerDialog,
   fileUpload: FileUploadDialog,
   openLocation: OpenLocationDialog,
+  renameFile: RenameFileDialog,
 } as const
diff --git a/client/components/Application/Dialogs/MoveFile.tsx b/client/components/Application/Dialogs/MoveFile.tsx
deleted file mode 100644
index 865e97ce3..000000000
--- a/client/components/Application/Dialogs/MoveFile.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import CopyAllIcon from '@mui/icons-material/CopyAll'
-import InputDialog from '../../Parts/Dialogs/Input'
-import * as store from '@client/store'
-
-export default function MoveFileDialog() {
-  const path = store.useStore((state) => state.path)
-  if (!path) return null
-
-  return (
-    <InputDialog
-      open={true}
-      value={path}
-      title="Move File"
-      label="Move"
-      Icon={CopyAllIcon}
-      placholder="Enter a path"
-      description={`You are moving "${path}". Enter destination:`}
-      onCancel={store.closeDialog}
-      onConfirm={async (toPath) => {
-        await store.moveFile(path, toPath)
-        store.closeDialog()
-      }}
-    />
-  )
-}
diff --git a/client/components/Application/Dialogs/MoveFolder.tsx b/client/components/Application/Dialogs/MoveFolder.tsx
deleted file mode 100644
index 4a6cd85f3..000000000
--- a/client/components/Application/Dialogs/MoveFolder.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import CopyAllIcon from '@mui/icons-material/CopyAll'
-import InputDialog from '../../Parts/Dialogs/Input'
-import * as store from '@client/store'
-
-export default function MoveFolderDialog() {
-  const path = store.useStore((state) => state.path)
-  if (!path) return null
-
-  return (
-    <InputDialog
-      open={true}
-      value={path}
-      title="Move Folder"
-      label="Move"
-      Icon={CopyAllIcon}
-      placholder="Enter a path"
-      description={`You are moving "${path}". Enter destination:`}
-      onCancel={store.closeDialog}
-      onConfirm={async (toPath) => {
-        await store.moveFolder(path, toPath)
-        store.closeDialog()
-      }}
-    />
-  )
-}
diff --git a/client/components/Application/Dialogs/RenameFile.tsx b/client/components/Application/Dialogs/RenameFile.tsx
new file mode 100644
index 000000000..57609378f
--- /dev/null
+++ b/client/components/Application/Dialogs/RenameFile.tsx
@@ -0,0 +1,27 @@
+import InputDialog from '../../Parts/Dialogs/Input'
+import * as store from '@client/store'
+
+export default function RenameFileDialog() {
+  const currentFilePath = store.useStore((state) => state.path)
+  const isFolder = store.useStore(store.getIsFolder)
+
+  return (
+    <InputDialog
+      open={true}
+      value=""
+      title={`Rename ${isFolder ? 'folder' : 'file'}`}
+      label="Save"
+      placholder={`Name of new ${isFolder ? 'folder' : 'file'}`}
+      onCancel={store.closeDialog}
+      onConfirm={async (newPath) => {
+        if (currentFilePath)
+          if (!isFolder) {
+            await store.renameFile(currentFilePath, newPath)
+          } else {
+            await store.renameFolder(currentFilePath, newPath)
+          }
+        store.closeDialog()
+      }}
+    />
+  )
+}
diff --git a/client/components/Parts/Trees/File.tsx b/client/components/Parts/Trees/File.tsx
index 9dd94815f..2e99e0c1e 100644
--- a/client/components/Parts/Trees/File.tsx
+++ b/client/components/Parts/Trees/File.tsx
@@ -11,6 +11,7 @@ import { useTheme } from '@mui/material/styles'
 import openFolderIcon from '../../../assets/open_folder_icon.svg'
 import closedFolderIcon from '../../../assets/closed_folder_icon.svg'
 import deleteIcon from '../../../assets/delete_icon.svg'
+import renameIcon from '../../../assets/rename_icon.svg'
 import openFileLocationIcon from '../../../assets/open_file_location_icon.svg'
 import MoreHorizIcon from '@mui/icons-material/MoreHoriz'
 import IconButton from '../../Parts/Buttons/Icon'
@@ -119,6 +120,11 @@ const StyledTreeItem = styled(
       handleClose()
     }
 
+    const handleRename = () => {
+      store.openDialog('renameFile')
+      handleClose()
+    }
+
     const fileOrFolder = item.type === 'folder' ? 'folder': 'file'
     
     return (
@@ -177,11 +183,27 @@ const StyledTreeItem = styled(
             'aria-labelledby': 'file-context-menu-btn',
           }}
         >
+          <MenuItem onClick={() => handleRename()}>
+            <ListItemIcon sx={{ 
+                  paddingTop: '6px',
+                  alignSelf: 'flex-start',
+                  minWidth: '24px',
+                  '& img' : {
+                    width: '20px'
+                  }
+              }}>
+              {<img src={renameIcon} alt="" />}
+            </ListItemIcon>
+            <ListItemText primary="Rename" />
+          </MenuItem>
           <MenuItem onClick={() => handleOpenFileLocation(item.path)}>
             <ListItemIcon sx={{ 
                   paddingTop: '6px',
                   alignSelf: 'flex-start',
-                  minWidth: '24px'
+                  minWidth: '24px',
+                  '& img' : {
+                    width: '20px'
+                  }
               }}>
               {<img src={openFileLocationIcon} alt="" />}
             </ListItemIcon>
@@ -191,7 +213,10 @@ const StyledTreeItem = styled(
             <ListItemIcon sx={{ 
                   paddingTop: '6px',
                   alignSelf: 'flex-start',
-                  minWidth: '24px'
+                  minWidth: '24px',
+                  '& img' : {
+                    width: '20px'
+                  }
               }}>
               {<img src={deleteIcon} alt="" />}
             </ListItemIcon>
diff --git a/client/store/actions/file.ts b/client/store/actions/file.ts
index 78f4ff0c4..da8edc263 100644
--- a/client/store/actions/file.ts
+++ b/client/store/actions/file.ts
@@ -42,22 +42,16 @@ export async function selectFile(props: { path?: string; updated?: boolean }) {
   await openFile()
 }
 
-export async function selectFileWithoutOpening(props: {
-  path?: string
-  updated?: boolean
-}) {
-  const { path, record } = store.getState()
-  if (!props.updated && path === props.path) return
+export async function selectFileWithoutOpening(props: { path?: string }) {
+  const { path } = store.getState()
 
-  await closeFile()
+  if (path === props.path) return
 
   store.setState('select-file', (state) => {
     state.path = props.path
   })
 
   if (!props.path) return
-  if (getIsFolder(store.getState())) return
-  if (!props.updated && record?.path === props.path) return
 }
 
 async function openFile() {
@@ -228,8 +222,8 @@ export async function deleteFiles(paths: string[]) {
   await onFileDeleted(paths)
 }
 
-export async function moveFile(path: string, toPath: string) {
-  const result = await client.fileMove({ path, toPath, deduplicate: true })
+export async function renameFile(path: string, toPath: string) {
+  const result = await client.fileRename({ path, toPath, deduplicate: true })
 
   if (result instanceof client.Error) {
     return store.setState('move-file-error', (state) => {
diff --git a/client/store/actions/folder.ts b/client/store/actions/folder.ts
index a6ac184fc..0d1d66814 100644
--- a/client/store/actions/folder.ts
+++ b/client/store/actions/folder.ts
@@ -40,8 +40,8 @@ export async function deleteFolders(paths: string[]) {
   await onFileDeleted(paths)
 }
 
-export async function moveFolder(path: string, toPath: string) {
-  const result = await client.folderMove({ path, toPath, deduplicate: true })
+export async function renameFolder(path: string, toPath: string) {
+  const result = await client.folderRename({ path, toPath, deduplicate: true })
 
   if (result instanceof client.Error) {
     return store.setState('move-folder-error', (state) => {
diff --git a/client/store/state.ts b/client/store/state.ts
index 2a9bffa7f..b4bfc7845 100644
--- a/client/store/state.ts
+++ b/client/store/state.ts
@@ -177,8 +177,6 @@ export type IDialog =
   | 'create'
   | 'deleteFilesFolders'
   | 'indexFiles'
-  | 'moveFile'
-  | 'moveFolder'
   | 'start'
   | 'publish'
   | 'chat'
@@ -187,6 +185,7 @@ export type IDialog =
   | 'welcomeBanner'
   | 'fileUpload'
   | 'openLocation'
+  | 'renameFile'
 
 export type IPanel = 'metadata' | 'report' | 'changes' | 'source'
 

From c7fd20e794b070b63fd37e13252baafdc5421a8c Mon Sep 17 00:00:00 2001
From: Guergana Tzatchkova <pestanias@yahoo.com>
Date: Tue, 5 Nov 2024 13:29:45 -0600
Subject: [PATCH 06/14] Add error counter to menu bar errors Report Button
 (#611)

---
 client/components/Controllers/Table/Menu.tsx |  2 ++
 client/components/Parts/Bars/Menu.tsx        |  7 ++++++-
 client/components/Parts/Buttons/Icon.tsx     | 13 +++++++++++--
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/client/components/Controllers/Table/Menu.tsx b/client/components/Controllers/Table/Menu.tsx
index 85b66cfa4..6904a2cbb 100644
--- a/client/components/Controllers/Table/Menu.tsx
+++ b/client/components/Controllers/Table/Menu.tsx
@@ -19,6 +19,7 @@ export default function Menu() {
           sx={{
             display: 'flex',
             flexDirection: 'row',
+            alignItems: 'center',
           }}
         >
           <menu.MetadataButton
@@ -31,6 +32,7 @@ export default function Menu() {
             active={panel === 'report'}
             onClick={() => store.togglePanel('report')}
             color="OKFNCoolGray"
+            numberErrors={report?.stats.errors}
           />
           <menu.SourceButton
             disabled={!source?.text}
diff --git a/client/components/Parts/Bars/Menu.tsx b/client/components/Parts/Bars/Menu.tsx
index 195162220..2b4d3e559 100644
--- a/client/components/Parts/Bars/Menu.tsx
+++ b/client/components/Parts/Bars/Menu.tsx
@@ -50,6 +50,10 @@ export interface ButtonProps {
   onClick?: () => void
 }
 
+interface ErrorsReportProps extends ButtonProps {
+  numberErrors?: number
+}
+
 export function MetadataButton(props: ButtonProps) {
   const theme = useTheme()
   const onClick = props.onClick || noop
@@ -83,7 +87,7 @@ export function MetadataButton(props: ButtonProps) {
   )
 }
 
-export function ReportButton(props: ButtonProps) {
+export function ReportButton(props: ErrorsReportProps ) {
   const theme = useTheme()
   const onClick = props.onClick || noop
   useKeyPress(['alt.r'], (event) => {
@@ -111,6 +115,7 @@ export function ReportButton(props: ButtonProps) {
               color: props.enabled ? theme.palette.info.main : undefined,
             },
           }}
+          extraInfo={props.numberErrors}
         />
       </Box>
   )
diff --git a/client/components/Parts/Buttons/Icon.tsx b/client/components/Parts/Buttons/Icon.tsx
index f3f4728f2..cb9020f8d 100644
--- a/client/components/Parts/Buttons/Icon.tsx
+++ b/client/components/Parts/Buttons/Icon.tsx
@@ -1,15 +1,17 @@
 import * as React from 'react'
 import Typography from '@mui/material/Typography'
 import Button, { ButtonProps } from '@mui/material/Button'
-
+import Box from '@mui/material/Box'
 interface IconButtonProps extends ButtonProps {
   Icon: React.ElementType
   label?: string
   small?: boolean
+  extraInfo?: string | number
 }
 
 export default function IconButton(props: IconButtonProps) {
-  const { Icon, label, small, ...others } = props
+  const { Icon, label, small, extraInfo, ...others } = props
+
   return (
     <Button
       fullWidth={!props.small}
@@ -24,6 +26,13 @@ export default function IconButton(props: IconButtonProps) {
       ) : (
         label
       )}
+      {extraInfo ? (
+        <Box sx={{ padding: '3px 5px', backgroundColor: '#FCF2F2', border: '1px solid #FECBCA', borderRadius: '3px', marginLeft: '5px' }}>
+          <Typography sx={{ fontSize: '9px', fontWeight: 300, color: (theme) => theme.palette.OKFNRed500.main  }}>
+            {Number(extraInfo) >= 1000 ? '+999' : extraInfo}
+          </Typography>
+        </Box>
+      ) : null}
     </Button>
   )
 }

From 6ed51ec1127b1b0f8df400aa1aab3d1701a8cd09 Mon Sep 17 00:00:00 2001
From: gtzatchkova <guergana.tzatchkova@wikimedia.de>
Date: Wed, 30 Oct 2024 21:07:17 +0100
Subject: [PATCH 07/14] Add hover states for buttons

---
 client/components/Application/Content.tsx        |  9 ++++++++-
 client/components/Application/Sidebar.tsx        | 11 ++++++++++-
 client/components/Parts/Buttons/SimpleButton.tsx |  7 +++++--
 client/components/Parts/Dialogs/OneButton.tsx    |  1 +
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/client/components/Application/Content.tsx b/client/components/Application/Content.tsx
index 12a69b656..c999eed72 100644
--- a/client/components/Application/Content.tsx
+++ b/client/components/Application/Content.tsx
@@ -88,7 +88,14 @@ function EmptyContent() {
           The ODE supports Excel & csv files
         </Typography>
         <Button
-          sx={{ my: 0.5, width: '236px', textTransform: 'none' }}
+          sx={{
+            my: 0.5,
+            width: '236px',
+            textTransform: 'none',
+            '&:hover': {
+              backgroundColor: (theme) => theme.palette.OKFNBlue.main,
+            },
+          }}
           variant="contained"
           aria-label="accept"
           onClick={() => store.openDialog('fileUpload')}
diff --git a/client/components/Application/Sidebar.tsx b/client/components/Application/Sidebar.tsx
index 5e1b6c0ea..006602e38 100644
--- a/client/components/Application/Sidebar.tsx
+++ b/client/components/Application/Sidebar.tsx
@@ -21,7 +21,16 @@ export default function Sidebar() {
       </Box>
       <Button
         variant="outlined"
-        sx={{ textTransform: 'none', marginBottom: '22px', mx: '24px' }}
+        sx={{
+          textTransform: 'none',
+          marginBottom: '22px',
+          mx: '24px',
+          '&:hover': {
+            color: 'white',
+            borderColor: (theme) => theme.palette.OKFNBlue.main,
+            backgroundColor: (theme) => theme.palette.OKFNBlue.main,
+          },
+        }}
         onClick={() => store.openDialog('fileUpload')}
       >
         Upload your data
diff --git a/client/components/Parts/Buttons/SimpleButton.tsx b/client/components/Parts/Buttons/SimpleButton.tsx
index d5e4449c7..b43e46ccf 100644
--- a/client/components/Parts/Buttons/SimpleButton.tsx
+++ b/client/components/Parts/Buttons/SimpleButton.tsx
@@ -4,10 +4,11 @@ import Button, { ButtonProps } from '@mui/material/Button'
 interface SimpleButtonProps extends ButtonProps {
   label?: string
   small?: boolean
+  hoverBgColor?: string
 }
 
 export default function SimpleButton(props: SimpleButtonProps) {
-  const { label, ...others } = props
+  const { label, hoverBgColor, ...others } = props
 
   const buttonTextColor = props.color === 'OKFNWhite' ? 'gray': 'white'
   return (
@@ -15,7 +16,9 @@ export default function SimpleButton(props: SimpleButtonProps) {
       fullWidth={!props.small}
       color={props.color}
       {...others}
-      sx={{ padding: '14px 24px', borderRadius: '9px', border: props.label === 'Cancel' ? '1px solid #D3D7D8' : 0, boxShadow: 'none' }}
+      sx={{ padding: '14px 24px', borderRadius: '9px', border: props.label === 'Cancel' ? '1px solid #D3D7D8' : 0, boxShadow: 'none', '&:hover': {
+        backgroundColor: (theme) => hoverBgColor === 'OKFNBlue' ? theme.palette.OKFNBlue.main : 'unset'
+      } }}
     >
       {(
         <Typography sx={{ textTransform: 'capitalize', fontWeight: 700, color: (theme) => props.disabled ? theme.palette.OKFNGray700.main : buttonTextColor, }}>
diff --git a/client/components/Parts/Dialogs/OneButton.tsx b/client/components/Parts/Dialogs/OneButton.tsx
index b5691aa50..940a4eb2d 100644
--- a/client/components/Parts/Dialogs/OneButton.tsx
+++ b/client/components/Parts/Dialogs/OneButton.tsx
@@ -90,6 +90,7 @@ export default function OneButtonDialog(props: OneButtonDialogProps) {
           onClick={handleConfirm}
           aria-label="accept"
           variant="contained"
+          hoverBgColor='OKFNBlue'
           color={ props.label === 'Delete' ? 'OKFNRed500' : 'OKFNBlack' }
           disabled={props.disabled || props.loading}
         />

From 28980d509fcdedf6622e184debd8645492d6f1cf Mon Sep 17 00:00:00 2001
From: gtzatchkova <guergana.tzatchkova@wikimedia.de>
Date: Thu, 31 Oct 2024 16:32:48 +0100
Subject: [PATCH 08/14] Adjust styles for Publish, Save changes, Upload data
 buttons

Also welcomeBanner and FileUpload
---
 client/components/Application/Content.tsx            |  1 +
 client/components/Application/Dialogs/FileUpload.tsx |  2 ++
 .../components/Application/Dialogs/WelcomeBanner.tsx |  7 +++++--
 client/components/Parts/Bars/Action.tsx              | 12 ++++++++----
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/client/components/Application/Content.tsx b/client/components/Application/Content.tsx
index c999eed72..0d3c89f44 100644
--- a/client/components/Application/Content.tsx
+++ b/client/components/Application/Content.tsx
@@ -92,6 +92,7 @@ function EmptyContent() {
             my: 0.5,
             width: '236px',
             textTransform: 'none',
+            backgroundColor: (theme) => theme.palette.OKFNBlack.main,
             '&:hover': {
               backgroundColor: (theme) => theme.palette.OKFNBlue.main,
             },
diff --git a/client/components/Application/Dialogs/FileUpload.tsx b/client/components/Application/Dialogs/FileUpload.tsx
index 0e2f14b1c..1020c5d33 100644
--- a/client/components/Application/Dialogs/FileUpload.tsx
+++ b/client/components/Application/Dialogs/FileUpload.tsx
@@ -211,6 +211,8 @@ export default function FileUploadDialog() {
                 sx={{ my: 0.5, marginTop: '53px' }}
                 variant="contained"
                 aria-label="accept"
+                hoverBgColor="OKFNBlue"
+                color="OKFNBlack"
                 disabled={!remoteUrlValue}
                 onClick={() => onAddRemoteConfirm(remoteUrlValue)}
               />
diff --git a/client/components/Application/Dialogs/WelcomeBanner.tsx b/client/components/Application/Dialogs/WelcomeBanner.tsx
index 835324abd..1350196e7 100644
--- a/client/components/Application/Dialogs/WelcomeBanner.tsx
+++ b/client/components/Application/Dialogs/WelcomeBanner.tsx
@@ -8,6 +8,7 @@ import * as store from '@client/store'
 import * as React from 'react'
 import welcomescreenImg from './assets/welcomescreen.png'
 import { styled } from '@mui/material/styles'
+import { useTheme } from '@mui/material/styles'
 
 export default function WelcomeBanner() {
   const hideWelcomeScreen = store.useStore((state) => state.hideWelcomeScreen)
@@ -23,15 +24,17 @@ export default function WelcomeBanner() {
     store.closeDialog()
   }
 
+  const theme = useTheme()
+
   const StyledButton = styled(SimpleButton)({
     boxShadow: 'none',
     textTransform: 'none',
     fontSize: 16,
     padding: '18px 0',
     lineHeight: 1.5,
-    backgroundColor: '#00D1FF',
+    backgroundColor: theme.palette.OKFNBlack.main,
     '&:hover': {
-      backgroundColor: '#11E2FF',
+      backgroundColor: theme.palette.OKFNBlue.main,
     },
     '&:active': {
       boxShadow: 'none',
diff --git a/client/components/Parts/Bars/Action.tsx b/client/components/Parts/Bars/Action.tsx
index 53ce2f68e..1fe7644e3 100644
--- a/client/components/Parts/Bars/Action.tsx
+++ b/client/components/Parts/Bars/Action.tsx
@@ -72,11 +72,13 @@ export function PublishButton(props: ButtonProps) {
       <IconButton
         label={props.label || 'Publish'}
         Icon={ElectricBoltIcon}
-        variant="outlined"
+        variant={!props.disabled ? 'contained' : 'outlined'}
         disabled={props.disabled}
         onClick={() => onClick()}
-        sx={{ backgroundColor: 'white', textTransform: 'none', color: (theme) => theme.palette.OKFNCoolGray.main, borderColor: (theme) => theme.palette.OKFNCoolGray.main, '&:hover': {
-          borderColor: (theme) => theme.palette.OKFNCoolGray.main
+        sx={{ backgroundColor: (theme) => props.disabled ? 'white' : theme.palette.OKFNBlack.main, textTransform: 'none', color: (theme) => theme.palette.OKFNWhite.main, '&:hover': {
+          color: (theme) => theme.palette.OKFNWhite.main,
+          borderColor: (theme) => theme.palette.OKFNBlue.main,
+          backgroundColor: (theme) => theme.palette.OKFNBlue.main
         }  }}
       />
     </Box>
@@ -122,7 +124,9 @@ export function SaveButton(props: ButtonProps) {
         variant={props.updated ? 'contained' : 'outlined'}
         disabled={!props.updated}
         onClick={() => onClick()}
-        sx={{ backgroundColor: !props.updated ? 'white' : undefined, textTransform: 'none' }}
+        sx={{ backgroundColor: (theme) => !props.updated ? 'white' :  theme.palette.OKFNBlack.main, '&:hover': {
+          backgroundColor: (theme) => theme.palette.OKFNBlue.main
+        }, textTransform: 'none' }}
       />
     </Box>
   )

From 65f232c80b067d86fc81610b2d3800c6c928c58b Mon Sep 17 00:00:00 2001
From: gtzatchkova <guergana.tzatchkova@wikimedia.de>
Date: Thu, 31 Oct 2024 16:46:29 +0100
Subject: [PATCH 09/14] Add blue background to two buttons dialogs

---
 client/components/Parts/Dialogs/TwoButton.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/components/Parts/Dialogs/TwoButton.tsx b/client/components/Parts/Dialogs/TwoButton.tsx
index 7f34f8b27..c40744c8c 100644
--- a/client/components/Parts/Dialogs/TwoButton.tsx
+++ b/client/components/Parts/Dialogs/TwoButton.tsx
@@ -104,6 +104,7 @@ export default function TwoButtonDialog(props: TwoButtonDialogProps) {
             onClick={handleConfirm}
             aria-label="accept"
             variant="contained"
+            hoverBgColor='OKFNBlue'
             color={ props.label === 'Delete' ? 'OKFNRed500' : 'OKFNBlack' }
             disabled={props.disabled || props.loading}
           />

From e453c9e60f66ca496ab792ddc20bf048773bf6f3 Mon Sep 17 00:00:00 2001
From: gtzatchkova <guergana.tzatchkova@wikimedia.de>
Date: Wed, 6 Nov 2024 01:59:56 +0100
Subject: [PATCH 10/14] Add option to pass red color for hover button state

---
 client/components/Application/Dialogs/DeleteFilesFolders.tsx | 1 +
 client/components/Parts/Buttons/SimpleButton.tsx             | 2 +-
 client/components/Parts/Dialogs/TwoButton.tsx                | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/client/components/Application/Dialogs/DeleteFilesFolders.tsx b/client/components/Application/Dialogs/DeleteFilesFolders.tsx
index 32d3ff4d0..9ae6719ee 100644
--- a/client/components/Application/Dialogs/DeleteFilesFolders.tsx
+++ b/client/components/Application/Dialogs/DeleteFilesFolders.tsx
@@ -31,6 +31,7 @@ export default function DeleteFilesFoldersDialog() {
           : `Are you sure you want to delete this ${isFolder ? 'folder' : 'file'}?`
       }
       label="Delete"
+      hoverBgButtonColor="OKFNRed400"
       cancelLabel="No"
       onCancel={store.closeDialog}
       onConfirm={async () => {
diff --git a/client/components/Parts/Buttons/SimpleButton.tsx b/client/components/Parts/Buttons/SimpleButton.tsx
index b43e46ccf..7b550e0b1 100644
--- a/client/components/Parts/Buttons/SimpleButton.tsx
+++ b/client/components/Parts/Buttons/SimpleButton.tsx
@@ -17,7 +17,7 @@ export default function SimpleButton(props: SimpleButtonProps) {
       color={props.color}
       {...others}
       sx={{ padding: '14px 24px', borderRadius: '9px', border: props.label === 'Cancel' ? '1px solid #D3D7D8' : 0, boxShadow: 'none', '&:hover': {
-        backgroundColor: (theme) => hoverBgColor === 'OKFNBlue' ? theme.palette.OKFNBlue.main : 'unset'
+        backgroundColor: (theme) => (hoverBgColor === 'OKFNBlue' || hoverBgColor === 'OKFNRed400' )? theme.palette[hoverBgColor].main : 'unset'
       } }}
     >
       {(
diff --git a/client/components/Parts/Dialogs/TwoButton.tsx b/client/components/Parts/Dialogs/TwoButton.tsx
index c40744c8c..684ca9361 100644
--- a/client/components/Parts/Dialogs/TwoButton.tsx
+++ b/client/components/Parts/Dialogs/TwoButton.tsx
@@ -23,6 +23,7 @@ export interface TwoButtonDialogProps {
   ctrlEnter?: boolean
   children?: React.ReactNode
   disableClosing?: boolean
+  hoverBgButtonColor?: string
 }
 
 export default function TwoButtonDialog(props: TwoButtonDialogProps) {
@@ -104,7 +105,7 @@ export default function TwoButtonDialog(props: TwoButtonDialogProps) {
             onClick={handleConfirm}
             aria-label="accept"
             variant="contained"
-            hoverBgColor='OKFNBlue'
+            hoverBgColor={ props.hoverBgButtonColor ? props.hoverBgButtonColor : 'OKFNBlue'}
             color={ props.label === 'Delete' ? 'OKFNRed500' : 'OKFNBlack' }
             disabled={props.disabled || props.loading}
           />

From c6f8d256d21e395eae409fb66b8ae5ee39e92035 Mon Sep 17 00:00:00 2001
From: gtzatchkova <guergana.tzatchkova@wikimedia.de>
Date: Fri, 8 Nov 2024 01:41:42 +0100
Subject: [PATCH 11/14] Add correct hover color for delete button in Delete
 dialog

---
 .../Application/Dialogs/DeleteFilesFolders.tsx        |  2 +-
 client/components/Parts/Buttons/SimpleButton.tsx      | 11 +++++++++--
 client/components/Parts/Dialogs/TwoButton.tsx         |  3 ++-
 client/themes.ts                                      |  5 +++++
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/client/components/Application/Dialogs/DeleteFilesFolders.tsx b/client/components/Application/Dialogs/DeleteFilesFolders.tsx
index 9ae6719ee..69601e402 100644
--- a/client/components/Application/Dialogs/DeleteFilesFolders.tsx
+++ b/client/components/Application/Dialogs/DeleteFilesFolders.tsx
@@ -31,7 +31,7 @@ export default function DeleteFilesFoldersDialog() {
           : `Are you sure you want to delete this ${isFolder ? 'folder' : 'file'}?`
       }
       label="Delete"
-      hoverBgButtonColor="OKFNRed400"
+      hoverBgButtonColor="OKFNRed600"
       cancelLabel="No"
       onCancel={store.closeDialog}
       onConfirm={async () => {
diff --git a/client/components/Parts/Buttons/SimpleButton.tsx b/client/components/Parts/Buttons/SimpleButton.tsx
index 7b550e0b1..64017c190 100644
--- a/client/components/Parts/Buttons/SimpleButton.tsx
+++ b/client/components/Parts/Buttons/SimpleButton.tsx
@@ -1,10 +1,17 @@
 import Typography from '@mui/material/Typography'
 import Button, { ButtonProps } from '@mui/material/Button'
 
+export const ButtonBgColor = {
+  OKFNRed600: 'OKFNRed600',
+  OKFNBlue: 'OKFNBlue',
+} as const;
+
+export type ButtonBgColorType = keyof typeof ButtonBgColor
+
 interface SimpleButtonProps extends ButtonProps {
   label?: string
   small?: boolean
-  hoverBgColor?: string
+  hoverBgColor?: ButtonBgColorType
 }
 
 export default function SimpleButton(props: SimpleButtonProps) {
@@ -17,7 +24,7 @@ export default function SimpleButton(props: SimpleButtonProps) {
       color={props.color}
       {...others}
       sx={{ padding: '14px 24px', borderRadius: '9px', border: props.label === 'Cancel' ? '1px solid #D3D7D8' : 0, boxShadow: 'none', '&:hover': {
-        backgroundColor: (theme) => (hoverBgColor === 'OKFNBlue' || hoverBgColor === 'OKFNRed400' )? theme.palette[hoverBgColor].main : 'unset'
+        backgroundColor: (theme) => hoverBgColor ? theme.palette[hoverBgColor].main : 'unset'
       } }}
     >
       {(
diff --git a/client/components/Parts/Dialogs/TwoButton.tsx b/client/components/Parts/Dialogs/TwoButton.tsx
index 684ca9361..ba500e8af 100644
--- a/client/components/Parts/Dialogs/TwoButton.tsx
+++ b/client/components/Parts/Dialogs/TwoButton.tsx
@@ -7,6 +7,7 @@ import DialogContent from '@mui/material/DialogContent'
 import SimpleButton from '../Buttons/SimpleButton'
 import IconButton from '@mui/material/IconButton'
 import CloseIcon from '@mui/icons-material/Close'
+import { ButtonBgColorType } from '../Buttons/SimpleButton'
 
 export interface TwoButtonDialogProps {
   open?: boolean
@@ -23,7 +24,7 @@ export interface TwoButtonDialogProps {
   ctrlEnter?: boolean
   children?: React.ReactNode
   disableClosing?: boolean
-  hoverBgButtonColor?: string
+  hoverBgButtonColor?: ButtonBgColorType
 }
 
 export default function TwoButtonDialog(props: TwoButtonDialogProps) {
diff --git a/client/themes.ts b/client/themes.ts
index ec679c8d6..597f5d117 100644
--- a/client/themes.ts
+++ b/client/themes.ts
@@ -9,6 +9,7 @@ declare module '@mui/material/styles' {
     OKFNBlue: SimplePaletteColorOptions
     OKFNRed400: SimplePaletteColorOptions
     OKFNRed500: SimplePaletteColorOptions
+    OKFNRed600: SimplePaletteColorOptions
     OKFNGreenBlue: SimplePaletteColorOptions
     OKFNBlack: SimplePaletteColorOptions
     OKFNWhite: SimplePaletteColorOptions
@@ -27,6 +28,7 @@ declare module '@mui/material/Button' {
     OKFNBlue: true
     OKFNRed400: true
     OKFNRed500: true
+    OKFNRed600: true
     OKFNGreenBlue: true
     OKFNBlack: true
     OKFNWhite: true
@@ -89,6 +91,9 @@ export const DEFAULT = createTheme({
     OKFNRed500: {
       main: '#FF403F',
     },
+    OKFNRed600: {
+      main: '#DC2625',
+    },
     OKFNGreenBlue: {
       main: '#56C4A3',
     },

From 6897dedea00cdf1495c5f3c3ae7416e4ac3d2a65 Mon Sep 17 00:00:00 2001
From: gtzatchkova <guergana.tzatchkova@wikimedia.de>
Date: Fri, 8 Nov 2024 02:18:44 +0100
Subject: [PATCH 12/14] Apply correct border color to file upload boxes

---
 client/components/Application/Dialogs/FileUpload.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/components/Application/Dialogs/FileUpload.tsx b/client/components/Application/Dialogs/FileUpload.tsx
index 1020c5d33..1f7a48b33 100644
--- a/client/components/Application/Dialogs/FileUpload.tsx
+++ b/client/components/Application/Dialogs/FileUpload.tsx
@@ -121,7 +121,7 @@ export default function FileUploadDialog() {
                 <FileSelectBox
                   sx={{
                     ':hover': {
-                      borderColor: (theme) => theme.palette.primary.main,
+                      borderColor: (theme) => theme.palette.OKFNBlue.main,
                     },
                   }}
                 >
@@ -149,7 +149,7 @@ export default function FileUploadDialog() {
                 <FileSelectBox
                   sx={{
                     ':hover': {
-                      borderColor: (theme) => theme.palette.primary.main,
+                      borderColor: (theme) => theme.palette.OKFNBlue.main,
                     },
                   }}
                 >

From e1832110c1ebea3ee1b8ed4da51d91a5e8eb98a7 Mon Sep 17 00:00:00 2001
From: gtzatchkova <guergana.tzatchkova@wikimedia.de>
Date: Fri, 8 Nov 2024 02:19:03 +0100
Subject: [PATCH 13/14] Fix margin bottom for publish dialog content

---
 client/components/Application/Dialogs/Publish.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/components/Application/Dialogs/Publish.tsx b/client/components/Application/Dialogs/Publish.tsx
index 0cc922674..83052f37d 100644
--- a/client/components/Application/Dialogs/Publish.tsx
+++ b/client/components/Application/Dialogs/Publish.tsx
@@ -39,7 +39,7 @@ export default function PublishDialog() {
       onCancel={handleClose}
       onConfirm={publishedUrl ? handleClose : handlePublish}
     >
-      <Box sx={{ padding: '24px 24px 40px 24px' }}>
+      <Box sx={{ padding: '24px' }}>
         <PortalEditor
           portal={portal}
           onChange={(portal) => {

From f0443845a977355c6af186879b730963c29b8968 Mon Sep 17 00:00:00 2001
From: gtzatchkova <guergana.tzatchkova@wikimedia.de>
Date: Tue, 12 Nov 2024 21:00:05 +0100
Subject: [PATCH 14/14] Change message in unsaved changes dialogs

---
 .../components/Application/Dialogs/CloseWithUnsavedChanges.tsx  | 2 +-
 client/components/Application/Dialogs/UnsavedChanges.tsx        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/components/Application/Dialogs/CloseWithUnsavedChanges.tsx b/client/components/Application/Dialogs/CloseWithUnsavedChanges.tsx
index f164b4e38..0ed040322 100644
--- a/client/components/Application/Dialogs/CloseWithUnsavedChanges.tsx
+++ b/client/components/Application/Dialogs/CloseWithUnsavedChanges.tsx
@@ -20,7 +20,7 @@ export default function CloseWithUnsavedChangesDialog() {
       cancelLabel="Discard"
       label="Save"
       Icon={DangerousIcon}
-      description="There are unsaved changes."
+      description="There are unsaved changes. Please, click save or cancel."
       onCancel={onDiscard}
       onConfirm={onSave}
       disableClosing={true}
diff --git a/client/components/Application/Dialogs/UnsavedChanges.tsx b/client/components/Application/Dialogs/UnsavedChanges.tsx
index 9334ab70d..bfcd96d1c 100644
--- a/client/components/Application/Dialogs/UnsavedChanges.tsx
+++ b/client/components/Application/Dialogs/UnsavedChanges.tsx
@@ -20,7 +20,7 @@ export default function UnsavedChangesDialog() {
       cancelLabel="Discard"
       label="Save"
       Icon={DangerousIcon}
-      description="There are unsaved changes."
+      description="There are unsaved changes. Please, click save or cancel."
       onCancel={onDiscard}
       onConfirm={onSave}
     />