rename Cookie django-finder-search-realm -> django-finder-search-zone

Author: jrief

client/admin/SearchField.tsx

@@ -1,5 +1,5 @@
 import React, {useRef, useState} from 'react';
-import {useSearchRealm} from '../common/Storage';
+import {useSearchZone} from '../common/Storage';
 import DropDownMenu from '../common/DropDownMenu';
 import {Tooltip, TooltipTrigger, TooltipContent} from '../common/Tooltip';
 import SearchIcon from '../icons/search.svg';
@@ -36,7 +36,7 @@ export default function SearchField(props) {
 	const {columnRefs, setSearchResult, settings} = props;
 	const searchRef = useRef(null);
 	const [searchQuery, setSearchQuery] = useSearchParam('q');
-	const [searchRealm, setSearchRealm] = useSearchRealm('current');
+	const [searchZone, setSearchZone] = useSearchZone('current');
 
 	function handleSearch(event) {
 		const performSearch = () => {
@@ -65,9 +65,9 @@ export default function SearchField(props) {
 		}
 	}
 
-	function changeSearchRealm(value) {
-		if (value !== searchRealm) {
-			setSearchRealm(value);
+	function changeSearchZone(value) {
+		if (value !== searchZone) {
+			setSearchZone(value);
 			 Object.entries(columnRefs as React.MutableRefObject<any>).forEach(([folderId, columnRef]) => {
 			 	columnRef.current?.fetchInodes();
 			});
@@ -77,8 +77,8 @@ export default function SearchField(props) {
 	function getItemProps(value: string) {
 		return {
 			role: 'option',
-			'aria-selected': searchRealm === value,
-			onClick: () => changeSearchRealm(value),
+			'aria-selected': searchZone === value,
+			onClick: () => changeSearchZone(value),
 		};
 	}
 
@@ -101,7 +101,7 @@ export default function SearchField(props) {
 			<DropDownMenu
 				wrapperElement="span"
 				role="menuitem"
-				className="search-realm with-caret"
+				className="search-zone with-caret"
 			>
 				<li {...getItemProps('current')}>{gettext("From current folder")}</li>
 				<li {...getItemProps('everywhere')}>{gettext("In all folders")}</li>

client/browser/FileSelectDialog.tsx

@@ -13,7 +13,7 @@ import React, {
 import {useInView} from 'react-intersection-observer';
 import FigureLabels from '../common/FigureLabels';
 import FileUploader from '../common/FileUploader';
-import {useSearchRealm} from '../common/Storage';
+import {useSearchZone} from '../common/Storage';
 import BrowserEditor from './BrowserEditor';
 import FolderStructure from './FolderStructure';
 import MenuBar from './MenuBar';
@@ -105,7 +105,7 @@ const FileSelectDialog = forwardRef((props: any, forwardedRef) => {
 	const menuBarRef = useRef(null);
 	const [uploadedFile, setUploadedFile] = useState(null);
 	const [currentFolderElement, setCurrentFolderElement] = useState(null);
-	const [searchRealm, setSearchRealm] = useSearchRealm('current');
+	const [searchZone, setSearchZone] = useSearchZone('current');
 
 	useImperativeHandle(forwardedRef, () => ({scrollToCurrentFolder, dismissAndClose}));
 
@@ -139,9 +139,9 @@ const FileSelectDialog = forwardRef((props: any, forwardedRef) => {
 		setDirty(true);
 	}
 
-	function changeSearchRealm(value) {
-		if (value !== searchRealm) {
-			setSearchRealm(value);
+	function changeSearchZone(value) {
+		if (value !== searchZone) {
+			setSearchZone(value);
 			setStructure({
 				...structure,
 				files: [],
@@ -268,8 +268,8 @@ const FileSelectDialog = forwardRef((props: any, forwardedRef) => {
 					refreshFilesList={refreshFilesList}
 					setDirty={setDirty}
 					setSearchQuery={setSearchQuery}
-					searchRealm={searchRealm}
-					setSearchRealm={changeSearchRealm}
+					searchZone={searchZone}
+					setSearchZone={changeSearchZone}
 				/>
 				<div className="browser-body">
 					<nav className="folder-structure">

client/browser/MenuBar.tsx

@@ -8,7 +8,7 @@ import {Tooltip, TooltipContent, TooltipTrigger} from "../common/Tooltip";
 
 
 const MenuBar = forwardRef((props: any, forwardedRef) => {
-	const {openUploader, labels, refreshFilesList, setDirty, setSearchQuery, searchRealm, setSearchRealm} = props;
+	const {openUploader, labels, refreshFilesList, setDirty, setSearchQuery, searchZone, setSearchZone} = props;
 	const ref = useRef(null);
 	const searchRef = useRef(null);
 
@@ -33,18 +33,18 @@ const MenuBar = forwardRef((props: any, forwardedRef) => {
 		}
 	}
 
-	function changeSearchRealm(value) {
-		if (value !== searchRealm) {
-			setSearchRealm(value);
+	function changeSearchZone(value) {
+		if (value !== searchZone) {
+			setSearchZone(value);
 			setDirty(true);
 		}
 	}
 
 	function getItemProps(value: string) {
 		return {
 			role: 'option',
-			'aria-selected': searchRealm === value,
-			onClick: () => changeSearchRealm(value),
+			'aria-selected': searchZone === value,
+			onClick: () => changeSearchZone(value),
 		};
 	}
 
@@ -68,7 +68,7 @@ const MenuBar = forwardRef((props: any, forwardedRef) => {
 					<DropDownMenu
 						role="menuitem"
 						wrapperElement="span"
-						className="search-realm with-caret"
+						className="search-zone with-caret"
 						root={rootNode}
 					>
 						<li {...getItemProps('current')}>{gettext("From current folder")}</li>

client/common/Storage.ts

@@ -60,4 +60,4 @@ export function useCookie(key, initial) : [any, (value: any) => any] {
 }
 
 
-export const useSearchRealm = initial => useCookie('django-finder-search-realm', initial);
+export const useSearchZone = initial => useCookie('django-finder-search-zone', initial);

client/scss/_menubar.scss

@@ -84,7 +84,7 @@
 							}
 						}
 
-						.search-realm {
+						.search-zone {
 							display: flex;
 						}
 					}

finder/admin/folder.py

@@ -194,8 +194,8 @@ def fetch_inodes(self, request, folder_id):
         })
 
     def search_for_inodes(self, request, current_folder, search_query, **lookup):
-        search_realm = request.COOKIES.get('django-finder-search-realm')
-        if search_realm == 'everywhere':
+        search_zone = request.COOKIES.get('django-finder-search-zone')
+        if search_zone == 'everywhere':
             starting_folder = self.get_realm(request).root_folder
         else:
             starting_folder = current_folder

finder/browser/views.py

@@ -195,8 +195,8 @@ def search(self, request, folder_id):
             return HttpResponseBadRequest("No search query provided.")
         offset = int(request.GET.get('offset', 0))
         starting_folder = FolderModel.objects.get(id=folder_id)
-        search_realm = request.COOKIES.get('django-finder-search-realm')
-        if search_realm == 'everywhere':
+        search_zone = request.COOKIES.get('django-finder-search-zone')
+        if search_zone == 'everywhere':
             starting_folder = list(starting_folder.ancestors)[-1]
         if isinstance(starting_folder.descendants, QuerySet):
             parent_ids = Subquery(starting_folder.descendants.values('id'))