From c2b51f6aa2f21b1cf8358daeb1b90184c552d7c0 Mon Sep 17 00:00:00 2001 From: Dion Date: Sun, 4 Feb 2024 12:01:34 +0100 Subject: [PATCH] rename to internal folder instead of shared --- .../color-class-filter/color-class-filter.tsx | 25 ++++-- .../class-name-container.ts | 0 .../{shared => internal}/clean-color-class.ts | 0 .../get-filter-url-color-class.ts | 0 .../shift-selection-helper.spec.ts | 0 .../shift-selection-helper.ts | 0 .../warning-box-no-photos-filter.spec.tsx | 0 .../warning-box-no-photos-filter.tsx | 0 .../item-list-view/item-list-view.spec.tsx | 73 +++------------ .../item-list-view/item-list-view.tsx | 11 +-- .../arrow-key-down.spec.ts | 0 .../{shared => internal}/arrow-key-down.ts | 0 .../inline-search-suggest.spec.tsx | 0 .../inline-search-suggest.tsx | 0 .../{shared => internal}/navigate.spec.ts | 0 .../{shared => internal}/navigate.ts | 0 .../menu-inline-search.spec.tsx | 74 +++++----------- .../menu-inline-search/menu-inline-search.tsx | 52 ++++------- .../detail-view-media/detail-view-mp4.tsx | 65 ++++---------- .../{shared => internal}/controls.spec.tsx | 0 .../{shared => internal}/controls.tsx | 0 .../get-mouse-position.spec.ts | 0 .../get-mouse-position.ts | 0 .../get-video-class-name.spec.ts | 0 .../get-video-class-name.ts | 0 .../{shared => internal}/play-pause.spec.ts | 0 .../{shared => internal}/play-pause.ts | 0 .../progress-bar.spec.tsx | 0 .../{shared => internal}/progress-bar.tsx | 0 .../set-default-effect.spec.ts | 0 .../set-default-effect.ts | 0 .../{shared => internal}/time-update.spec.ts | 0 .../{shared => internal}/time-update.ts | 0 .../update-progress-by-click.spec.ts | 0 .../update-progress-by-click.ts | 0 .../{shared => internal}/waiting.spec.ts | 0 .../{shared => internal}/waiting.ts | 0 .../upload-menu-item.spec.tsx | 0 .../{shared => internal}/upload-menu-item.tsx | 0 .../organisms/menu-archive/menu-archive.tsx | 58 ++++-------- .../go-to-parent-folder.spec.tsx | 0 .../go-to-parent-folder.tsx | 0 .../menu-detail-view/menu-detail-view.tsx | 88 +++++-------------- .../add-default-click-set-marker.ts | 0 .../add-default-marker.ts | 0 .../add-map-location-center.ts | 0 .../modal-geo/{shared => internal}/add-map.ts | 0 .../{shared => internal}/blue-icon.ts | 0 .../{shared => internal}/get-zoom.ts | 0 .../lat-long-round.spec.ts | 0 .../{shared => internal}/lat-long-round.ts | 0 .../modal-geo/{shared => internal}/on-drag.ts | 0 .../realtime-map-update.ts | 0 .../{shared => internal}/set-marker.spec.ts | 0 .../{shared => internal}/set-marker.ts | 0 .../update-button.spec.tsx | 0 .../{shared => internal}/update-button.tsx | 0 .../update-geo-location.spec.ts | 0 .../update-geo-location.ts | 0 .../{shared => internal}/update-map.ts | 0 .../organisms/modal-geo/modal-geo.tsx | 31 ++----- .../is-client-side-feature-disabled.ts1} | 0 .../src/hooks/realtime/use-sockets.tsx | 6 +- 63 files changed, 130 insertions(+), 353 deletions(-) rename starsky/starsky/clientapp/src/components/molecules/color-class-filter/{shared => internal}/class-name-container.ts (100%) rename starsky/starsky/clientapp/src/components/molecules/color-class-filter/{shared => internal}/clean-color-class.ts (100%) rename starsky/starsky/clientapp/src/components/molecules/color-class-filter/{shared => internal}/get-filter-url-color-class.ts (100%) rename starsky/starsky/clientapp/src/components/molecules/item-list-view/{shared => internal}/shift-selection-helper.spec.ts (100%) rename starsky/starsky/clientapp/src/components/molecules/item-list-view/{shared => internal}/shift-selection-helper.ts (100%) rename starsky/starsky/clientapp/src/components/molecules/item-list-view/{shared => internal}/warning-box-no-photos-filter.spec.tsx (100%) rename starsky/starsky/clientapp/src/components/molecules/item-list-view/{shared => internal}/warning-box-no-photos-filter.tsx (100%) rename starsky/starsky/clientapp/src/components/molecules/menu-inline-search/{shared => internal}/arrow-key-down.spec.ts (100%) rename starsky/starsky/clientapp/src/components/molecules/menu-inline-search/{shared => internal}/arrow-key-down.ts (100%) rename starsky/starsky/clientapp/src/components/molecules/menu-inline-search/{shared => internal}/inline-search-suggest.spec.tsx (100%) rename starsky/starsky/clientapp/src/components/molecules/menu-inline-search/{shared => internal}/inline-search-suggest.tsx (100%) rename starsky/starsky/clientapp/src/components/molecules/menu-inline-search/{shared => internal}/navigate.spec.ts (100%) rename starsky/starsky/clientapp/src/components/molecules/menu-inline-search/{shared => internal}/navigate.ts (100%) rename starsky/starsky/clientapp/src/components/organisms/detail-view-media/{shared => internal}/controls.spec.tsx (100%) rename starsky/starsky/clientapp/src/components/organisms/detail-view-media/{shared => internal}/controls.tsx (100%) rename starsky/starsky/clientapp/src/components/organisms/detail-view-media/{shared => internal}/get-mouse-position.spec.ts (100%) rename starsky/starsky/clientapp/src/components/organisms/detail-view-media/{shared => internal}/get-mouse-position.ts (100%) rename starsky/starsky/clientapp/src/components/organisms/detail-view-media/{shared => internal}/get-video-class-name.spec.ts (100%) rename starsky/starsky/clientapp/src/components/organisms/detail-view-media/{shared => internal}/get-video-class-name.ts (100%) rename starsky/starsky/clientapp/src/components/organisms/detail-view-media/{shared => internal}/play-pause.spec.ts (100%) rename starsky/starsky/clientapp/src/components/organisms/detail-view-media/{shared => internal}/play-pause.ts (100%) rename starsky/starsky/clientapp/src/components/organisms/detail-view-media/{shared => internal}/progress-bar.spec.tsx (100%) rename starsky/starsky/clientapp/src/components/organisms/detail-view-media/{shared => internal}/progress-bar.tsx (100%) rename starsky/starsky/clientapp/src/components/organisms/detail-view-media/{shared => internal}/set-default-effect.spec.ts (100%) rename starsky/starsky/clientapp/src/components/organisms/detail-view-media/{shared => internal}/set-default-effect.ts (100%) rename starsky/starsky/clientapp/src/components/organisms/detail-view-media/{shared => internal}/time-update.spec.ts (100%) rename starsky/starsky/clientapp/src/components/organisms/detail-view-media/{shared => internal}/time-update.ts (100%) rename starsky/starsky/clientapp/src/components/organisms/detail-view-media/{shared => internal}/update-progress-by-click.spec.ts (100%) rename starsky/starsky/clientapp/src/components/organisms/detail-view-media/{shared => internal}/update-progress-by-click.ts (100%) rename starsky/starsky/clientapp/src/components/organisms/detail-view-media/{shared => internal}/waiting.spec.ts (100%) rename starsky/starsky/clientapp/src/components/organisms/detail-view-media/{shared => internal}/waiting.ts (100%) rename starsky/starsky/clientapp/src/components/organisms/menu-archive/{shared => internal}/upload-menu-item.spec.tsx (100%) rename starsky/starsky/clientapp/src/components/organisms/menu-archive/{shared => internal}/upload-menu-item.tsx (100%) rename starsky/starsky/clientapp/src/components/organisms/menu-detail-view/{shared => internal}/go-to-parent-folder.spec.tsx (100%) rename starsky/starsky/clientapp/src/components/organisms/menu-detail-view/{shared => internal}/go-to-parent-folder.tsx (100%) rename starsky/starsky/clientapp/src/components/organisms/modal-geo/{shared => internal}/add-default-click-set-marker.ts (100%) rename starsky/starsky/clientapp/src/components/organisms/modal-geo/{shared => internal}/add-default-marker.ts (100%) rename starsky/starsky/clientapp/src/components/organisms/modal-geo/{shared => internal}/add-map-location-center.ts (100%) rename starsky/starsky/clientapp/src/components/organisms/modal-geo/{shared => internal}/add-map.ts (100%) rename starsky/starsky/clientapp/src/components/organisms/modal-geo/{shared => internal}/blue-icon.ts (100%) rename starsky/starsky/clientapp/src/components/organisms/modal-geo/{shared => internal}/get-zoom.ts (100%) rename starsky/starsky/clientapp/src/components/organisms/modal-geo/{shared => internal}/lat-long-round.spec.ts (100%) rename starsky/starsky/clientapp/src/components/organisms/modal-geo/{shared => internal}/lat-long-round.ts (100%) rename starsky/starsky/clientapp/src/components/organisms/modal-geo/{shared => internal}/on-drag.ts (100%) rename starsky/starsky/clientapp/src/components/organisms/modal-geo/{shared => internal}/realtime-map-update.ts (100%) rename starsky/starsky/clientapp/src/components/organisms/modal-geo/{shared => internal}/set-marker.spec.ts (100%) rename starsky/starsky/clientapp/src/components/organisms/modal-geo/{shared => internal}/set-marker.ts (100%) rename starsky/starsky/clientapp/src/components/organisms/modal-geo/{shared => internal}/update-button.spec.tsx (100%) rename starsky/starsky/clientapp/src/components/organisms/modal-geo/{shared => internal}/update-button.tsx (100%) rename starsky/starsky/clientapp/src/components/organisms/modal-geo/{shared => internal}/update-geo-location.spec.ts (100%) rename starsky/starsky/clientapp/src/components/organisms/modal-geo/{shared => internal}/update-geo-location.ts (100%) rename starsky/starsky/clientapp/src/components/organisms/modal-geo/{shared => internal}/update-map.ts (100%) rename starsky/starsky/clientapp/src/hooks/realtime/{shared/Is-client-side-feature-disabled.ts => internal/is-client-side-feature-disabled.ts1} (100%) diff --git a/starsky/starsky/clientapp/src/components/molecules/color-class-filter/color-class-filter.tsx b/starsky/starsky/clientapp/src/components/molecules/color-class-filter/color-class-filter.tsx index 5c7d0e8369..00a39b88d8 100644 --- a/starsky/starsky/clientapp/src/components/molecules/color-class-filter/color-class-filter.tsx +++ b/starsky/starsky/clientapp/src/components/molecules/color-class-filter/color-class-filter.tsx @@ -10,6 +10,7 @@ import { GetFilterUrlColorClass } from "./shared/get-filter-url-color-class.ts"; import { CleanColorClass } from "./shared/clean-color-class.ts"; import { ClassNameContainer } from "./shared/class-name-container.ts"; import localization from "../../../localization/localization.json"; +import { IArchiveProps } from "../../../interfaces/IArchiveProps.ts"; // @@ -21,6 +22,19 @@ export interface IColorClassProp { sticky?: boolean; } +function stateFallback(state: IArchiveProps, props: IColorClassProp) { + // props is used as default, state only for update + if (!state) { + state = { + ...newIArchive(), + colorClassUsage: props.colorClassUsage, + colorClassActiveList: props.colorClassActiveList, + collectionsCount: props.itemsCount ? props.itemsCount : 0 + }; + } + return state; +} + const ColorClassFilter: React.FunctionComponent = memo((props) => { // content const settings = useGlobalSettings(); @@ -43,15 +57,8 @@ const ColorClassFilter: React.FunctionComponent = memo((props) const history = useLocation(); let { state } = React.useContext(ArchiveContext); - // props is used as default, state only for update - if (!state) { - state = { - ...newIArchive(), - colorClassUsage: props.colorClassUsage, - colorClassActiveList: props.colorClassActiveList, - collectionsCount: props.itemsCount ? props.itemsCount : 0 - }; - } + state = stateFallback(state, props); + const [colorClassUsage, setColorClassUsage] = useState(props.colorClassUsage); useEffect(() => { diff --git a/starsky/starsky/clientapp/src/components/molecules/color-class-filter/shared/class-name-container.ts b/starsky/starsky/clientapp/src/components/molecules/color-class-filter/internal/class-name-container.ts similarity index 100% rename from starsky/starsky/clientapp/src/components/molecules/color-class-filter/shared/class-name-container.ts rename to starsky/starsky/clientapp/src/components/molecules/color-class-filter/internal/class-name-container.ts diff --git a/starsky/starsky/clientapp/src/components/molecules/color-class-filter/shared/clean-color-class.ts b/starsky/starsky/clientapp/src/components/molecules/color-class-filter/internal/clean-color-class.ts similarity index 100% rename from starsky/starsky/clientapp/src/components/molecules/color-class-filter/shared/clean-color-class.ts rename to starsky/starsky/clientapp/src/components/molecules/color-class-filter/internal/clean-color-class.ts diff --git a/starsky/starsky/clientapp/src/components/molecules/color-class-filter/shared/get-filter-url-color-class.ts b/starsky/starsky/clientapp/src/components/molecules/color-class-filter/internal/get-filter-url-color-class.ts similarity index 100% rename from starsky/starsky/clientapp/src/components/molecules/color-class-filter/shared/get-filter-url-color-class.ts rename to starsky/starsky/clientapp/src/components/molecules/color-class-filter/internal/get-filter-url-color-class.ts diff --git a/starsky/starsky/clientapp/src/components/molecules/item-list-view/shared/shift-selection-helper.spec.ts b/starsky/starsky/clientapp/src/components/molecules/item-list-view/internal/shift-selection-helper.spec.ts similarity index 100% rename from starsky/starsky/clientapp/src/components/molecules/item-list-view/shared/shift-selection-helper.spec.ts rename to starsky/starsky/clientapp/src/components/molecules/item-list-view/internal/shift-selection-helper.spec.ts diff --git a/starsky/starsky/clientapp/src/components/molecules/item-list-view/shared/shift-selection-helper.ts b/starsky/starsky/clientapp/src/components/molecules/item-list-view/internal/shift-selection-helper.ts similarity index 100% rename from starsky/starsky/clientapp/src/components/molecules/item-list-view/shared/shift-selection-helper.ts rename to starsky/starsky/clientapp/src/components/molecules/item-list-view/internal/shift-selection-helper.ts diff --git a/starsky/starsky/clientapp/src/components/molecules/item-list-view/shared/warning-box-no-photos-filter.spec.tsx b/starsky/starsky/clientapp/src/components/molecules/item-list-view/internal/warning-box-no-photos-filter.spec.tsx similarity index 100% rename from starsky/starsky/clientapp/src/components/molecules/item-list-view/shared/warning-box-no-photos-filter.spec.tsx rename to starsky/starsky/clientapp/src/components/molecules/item-list-view/internal/warning-box-no-photos-filter.spec.tsx diff --git a/starsky/starsky/clientapp/src/components/molecules/item-list-view/shared/warning-box-no-photos-filter.tsx b/starsky/starsky/clientapp/src/components/molecules/item-list-view/internal/warning-box-no-photos-filter.tsx similarity index 100% rename from starsky/starsky/clientapp/src/components/molecules/item-list-view/shared/warning-box-no-photos-filter.tsx rename to starsky/starsky/clientapp/src/components/molecules/item-list-view/internal/warning-box-no-photos-filter.tsx diff --git a/starsky/starsky/clientapp/src/components/molecules/item-list-view/item-list-view.spec.tsx b/starsky/starsky/clientapp/src/components/molecules/item-list-view/item-list-view.spec.tsx index ac640af9bf..c1b075ce9f 100644 --- a/starsky/starsky/clientapp/src/components/molecules/item-list-view/item-list-view.spec.tsx +++ b/starsky/starsky/clientapp/src/components/molecules/item-list-view/item-list-view.spec.tsx @@ -3,15 +3,12 @@ import { act } from "react-dom/test-utils"; import { MemoryRouter } from "react-router-dom"; import { IUseLocation } from "../../../hooks/use-location/interfaces/IUseLocation"; import * as useLocation from "../../../hooks/use-location/use-location"; -import { - IFileIndexItem, - newIFileIndexItemArray -} from "../../../interfaces/IFileIndexItem"; +import { IFileIndexItem, newIFileIndexItemArray } from "../../../interfaces/IFileIndexItem"; import { Router } from "../../../router-app/router-app"; import * as FlatListItem from "../../atoms/flat-list-item/flat-list-item"; import * as ListImageChildItem from "../../atoms/list-image-child-item/list-image-child-item"; import ItemListView from "./item-list-view"; -import * as ShiftSelectionHelper from "./shared/shift-selection-helper"; +import * as ShiftSelectionHelper from "./internal/shift-selection-helper"; describe("ItemListView", () => { it("renders (without state component)", () => { @@ -32,17 +29,11 @@ describe("ItemListView", () => { it("search with data-filepath in child element", () => { const component = render( - + ); - const element = screen.queryAllByTestId( - "list-image-view-select-container" - )[0]; + const element = screen.queryAllByTestId("list-image-view-select-container")[0]; expect(element).toBeTruthy(); @@ -58,11 +49,7 @@ describe("ItemListView", () => { .mockImplementationOnce(() => <>); const component = render( - + ); expect(flatListItemSpy).toBeCalled(); @@ -72,11 +59,7 @@ describe("ItemListView", () => { it("no content", () => { const component = render( - + ); expect(component.container.textContent).toBe("no content"); @@ -84,12 +67,7 @@ describe("ItemListView", () => { it("text should be: New? Set your drive location in the settings. There are no photos in this folder", () => { const component = render( - + ); expect(component.container.textContent).toBe( "New? Set your drive location in the settings. There are no photos in this folder" @@ -98,25 +76,14 @@ describe("ItemListView", () => { it("text should be: There are no photos in this folder", () => { const component = render( - - ); - expect(component.container.textContent).toBe( - "There are no photos in this folder" + ); + expect(component.container.textContent).toBe("There are no photos in this folder"); }); it("you did select a different colorclass but there a no items with this colorclass", () => { const component = render( - + ); expect(component.container.textContent).toBe( "There are more items, but these are outside of your filters. To see everything click on 'Reset Filter'" @@ -143,9 +110,7 @@ describe("ItemListView", () => { navigate: jest.fn() } as unknown as IUseLocation; - jest - .spyOn(useLocation, "default") - .mockImplementationOnce(() => useLocationMock); + jest.spyOn(useLocation, "default").mockImplementationOnce(() => useLocationMock); jest.useFakeTimers(); @@ -179,17 +144,11 @@ describe("ItemListView", () => { const component = render( - + ); - const item = screen.queryByTestId( - "list-image-view-select-container" - ) as HTMLButtonElement; + const item = screen.queryByTestId("list-image-view-select-container") as HTMLButtonElement; console.log(component.container.innerHTML); expect(item).toBeTruthy(); @@ -223,11 +182,7 @@ describe("ItemListView", () => { .mockImplementationOnce(() => <>t); const component = render( - + ); expect(listImageChildItemSpy).toBeCalled(); diff --git a/starsky/starsky/clientapp/src/components/molecules/item-list-view/item-list-view.tsx b/starsky/starsky/clientapp/src/components/molecules/item-list-view/item-list-view.tsx index 6e63062706..a4249c9852 100644 --- a/starsky/starsky/clientapp/src/components/molecules/item-list-view/item-list-view.tsx +++ b/starsky/starsky/clientapp/src/components/molecules/item-list-view/item-list-view.tsx @@ -7,8 +7,8 @@ import { URLPath } from "../../../shared/url-path"; import FlatListItem from "../../atoms/flat-list-item/flat-list-item"; import ListImageChildItem from "../../atoms/list-image-child-item/list-image-child-item"; import ListImageViewSelectContainer from "../list-image-view-select-container/list-image-view-select-container"; -import { ShiftSelectionHelper } from "./shared/shift-selection-helper"; -import { WarningBoxNoPhotosFilter } from "./shared/warning-box-no-photos-filter"; +import { ShiftSelectionHelper } from "./internal/shift-selection-helper"; +import { WarningBoxNoPhotosFilter } from "./internal/warning-box-no-photos-filter"; interface ItemListProps { fileIndexItems: Array; @@ -17,6 +17,7 @@ interface ItemListProps { iconList?: boolean; subPath?: string; } + /** * A list with links to the items */ @@ -75,11 +76,7 @@ const ItemListView: React.FunctionComponent = memo((props) => { key={item.fileName + item.lastEdited + item.colorClass} onSelectionCallback={onSelectionCallback} > - {props.iconList ? ( - - ) : ( - - )} + {props.iconList ? : } ))} diff --git a/starsky/starsky/clientapp/src/components/molecules/menu-inline-search/shared/arrow-key-down.spec.ts b/starsky/starsky/clientapp/src/components/molecules/menu-inline-search/internal/arrow-key-down.spec.ts similarity index 100% rename from starsky/starsky/clientapp/src/components/molecules/menu-inline-search/shared/arrow-key-down.spec.ts rename to starsky/starsky/clientapp/src/components/molecules/menu-inline-search/internal/arrow-key-down.spec.ts diff --git a/starsky/starsky/clientapp/src/components/molecules/menu-inline-search/shared/arrow-key-down.ts b/starsky/starsky/clientapp/src/components/molecules/menu-inline-search/internal/arrow-key-down.ts similarity index 100% rename from starsky/starsky/clientapp/src/components/molecules/menu-inline-search/shared/arrow-key-down.ts rename to starsky/starsky/clientapp/src/components/molecules/menu-inline-search/internal/arrow-key-down.ts diff --git a/starsky/starsky/clientapp/src/components/molecules/menu-inline-search/shared/inline-search-suggest.spec.tsx b/starsky/starsky/clientapp/src/components/molecules/menu-inline-search/internal/inline-search-suggest.spec.tsx similarity index 100% rename from starsky/starsky/clientapp/src/components/molecules/menu-inline-search/shared/inline-search-suggest.spec.tsx rename to starsky/starsky/clientapp/src/components/molecules/menu-inline-search/internal/inline-search-suggest.spec.tsx diff --git a/starsky/starsky/clientapp/src/components/molecules/menu-inline-search/shared/inline-search-suggest.tsx b/starsky/starsky/clientapp/src/components/molecules/menu-inline-search/internal/inline-search-suggest.tsx similarity index 100% rename from starsky/starsky/clientapp/src/components/molecules/menu-inline-search/shared/inline-search-suggest.tsx rename to starsky/starsky/clientapp/src/components/molecules/menu-inline-search/internal/inline-search-suggest.tsx diff --git a/starsky/starsky/clientapp/src/components/molecules/menu-inline-search/shared/navigate.spec.ts b/starsky/starsky/clientapp/src/components/molecules/menu-inline-search/internal/navigate.spec.ts similarity index 100% rename from starsky/starsky/clientapp/src/components/molecules/menu-inline-search/shared/navigate.spec.ts rename to starsky/starsky/clientapp/src/components/molecules/menu-inline-search/internal/navigate.spec.ts diff --git a/starsky/starsky/clientapp/src/components/molecules/menu-inline-search/shared/navigate.ts b/starsky/starsky/clientapp/src/components/molecules/menu-inline-search/internal/navigate.ts similarity index 100% rename from starsky/starsky/clientapp/src/components/molecules/menu-inline-search/shared/navigate.ts rename to starsky/starsky/clientapp/src/components/molecules/menu-inline-search/internal/navigate.ts diff --git a/starsky/starsky/clientapp/src/components/molecules/menu-inline-search/menu-inline-search.spec.tsx b/starsky/starsky/clientapp/src/components/molecules/menu-inline-search/menu-inline-search.spec.tsx index 65166e6b67..7b8b724c1b 100644 --- a/starsky/starsky/clientapp/src/components/molecules/menu-inline-search/menu-inline-search.spec.tsx +++ b/starsky/starsky/clientapp/src/components/molecules/menu-inline-search/menu-inline-search.spec.tsx @@ -1,21 +1,12 @@ -import { - act, - fireEvent, - render, - screen, - waitFor -} from "@testing-library/react"; +import { act, fireEvent, render, screen, waitFor } from "@testing-library/react"; import React from "react"; import { MemoryRouter } from "react-router-dom"; import * as useFetch from "../../../hooks/use-fetch"; -import { - IConnectionDefault, - newIConnectionDefault -} from "../../../interfaces/IConnectionDefault"; +import { IConnectionDefault, newIConnectionDefault } from "../../../interfaces/IConnectionDefault"; import { IEnvFeatures } from "../../../interfaces/IEnvFeatures"; import MenuInlineSearch from "./menu-inline-search"; -import * as ArrowKeyDown from "./shared/arrow-key-down"; -import * as InlineSearchSuggest from "./shared/inline-search-suggest"; +import * as ArrowKeyDown from "./internal/arrow-key-down"; +import * as InlineSearchSuggest from "./internal/inline-search-suggest"; describe("menu-inline-search", () => { it("renders", () => { @@ -40,13 +31,9 @@ describe("menu-inline-search", () => { const menuBar = render(); // default - expect(menuBar.container.querySelector("label")?.classList).toContain( - "icon-addon--search" - ); + expect(menuBar.container.querySelector("label")?.classList).toContain("icon-addon--search"); - const input = menuBar.queryByTestId( - "menu-inline-search" - ) as HTMLInputElement; + const input = menuBar.queryByTestId("menu-inline-search") as HTMLInputElement; expect(input).not.toBeNull(); @@ -81,9 +68,7 @@ describe("menu-inline-search", () => { menuBar = render(); }); - const input = screen.queryByTestId( - "menu-inline-search" - ) as HTMLInputElement; + const input = screen.queryByTestId("menu-inline-search") as HTMLInputElement; expect(input).not.toBeNull(); @@ -100,13 +85,9 @@ describe("menu-inline-search", () => { input.blur(); }); - expect(menuBar.container.querySelector("label")?.classList).toContain( - "icon-addon--search" - ); + expect(menuBar.container.querySelector("label")?.classList).toContain("icon-addon--search"); - expect( - menuBar.findByTestId("menu-inline-search-search-icon") - ).toBeTruthy(); + expect(menuBar.findByTestId("menu-inline-search-search-icon")).toBeTruthy(); menuBar.unmount(); }); @@ -139,9 +120,7 @@ describe("menu-inline-search", () => { .mockImplementationOnce(() => newIConnectionDefault()); const callback = jest.fn(); - const menuBar = render( - - ); + const menuBar = render(); expect(screen.getByTestId("default-menu-item-trash")).toBeTruthy(); expect(screen.getByTestId("default-menu-item-logout")).toBeTruthy(); @@ -164,10 +143,7 @@ describe("menu-inline-search", () => { <> {props.suggest?.map((query, index) => index <= 8 ? ( -
  • +
  • ) : null )} @@ -181,8 +157,8 @@ describe("menu-inline-search", () => { ); - expect(inlineSearchSuggestSpy).toBeCalledTimes(1); - expect(inlineSearchSuggestSpy).toBeCalledWith( + expect(inlineSearchSuggestSpy).toHaveBeenCalledTimes(1); + expect(inlineSearchSuggestSpy).toHaveBeenCalledWith( { callback: callback, defaultText: "tes", @@ -211,13 +187,9 @@ describe("menu-inline-search", () => { .mockImplementationOnce(() => newIConnectionDefault()); const callback = jest.fn(); - const menuBar = render( - - ); + const menuBar = render(); - const input = screen.queryByTestId( - "menu-inline-search" - ) as HTMLInputElement; + const input = screen.queryByTestId("menu-inline-search") as HTMLInputElement; expect(input).not.toBeNull(); @@ -229,7 +201,7 @@ describe("menu-inline-search", () => { expect(results).toBeTruthy(); - expect(callback).toBeCalledTimes(0); + expect(callback).toHaveBeenCalledTimes(0); menuBar.unmount(); }); @@ -248,23 +220,17 @@ describe("menu-inline-search", () => { .mockImplementationOnce(() => newIConnectionDefault()); const callback = jest.fn(); - const menuBar = render( - - ); + const menuBar = render(); - const arrowKeyDownSpy = jest - .spyOn(ArrowKeyDown, "default") - .mockImplementationOnce(() => {}); + const arrowKeyDownSpy = jest.spyOn(ArrowKeyDown, "default").mockImplementationOnce(() => {}); - const input = screen.queryByTestId( - "menu-inline-search" - ) as HTMLInputElement; + const input = screen.queryByTestId("menu-inline-search") as HTMLInputElement; expect(input).not.toBeNull(); fireEvent.keyDown(input, { target: { value: "test" } }); - expect(arrowKeyDownSpy).toBeCalled(); + expect(arrowKeyDownSpy).toHaveBeenCalled(); menuBar.unmount(); }); diff --git a/starsky/starsky/clientapp/src/components/molecules/menu-inline-search/menu-inline-search.tsx b/starsky/starsky/clientapp/src/components/molecules/menu-inline-search/menu-inline-search.tsx index d260fe59e9..8e97ffe115 100644 --- a/starsky/starsky/clientapp/src/components/molecules/menu-inline-search/menu-inline-search.tsx +++ b/starsky/starsky/clientapp/src/components/molecules/menu-inline-search/menu-inline-search.tsx @@ -1,28 +1,25 @@ -import { useEffect, useRef, useState } from "react"; +import { FormEvent, FunctionComponent, useEffect, useRef, useState } from "react"; import useFetch from "../../../hooks/use-fetch"; import useLocation from "../../../hooks/use-location/use-location"; import { UrlQuery } from "../../../shared/url-query"; -import ArrowKeyDown from "./shared/arrow-key-down"; -import InlineSearchSuggest from "./shared/inline-search-suggest"; -import Navigate from "./shared/navigate"; +import ArrowKeyDown from "./internal/arrow-key-down"; +import InlineSearchSuggest from "./internal/inline-search-suggest"; +import Navigate from "./internal/navigate"; interface IMenuSearchBarProps { defaultText?: string; + callback?(query: string): void; } -const MenuInlineSearch: React.FunctionComponent = ( - props -) => { +const MenuInlineSearch: FunctionComponent = (props) => { const history = useLocation(); // the results const [suggest, setSuggest] = useState(new Array()); // to store the search query - const [query, setQuery] = useState( - props.defaultText ? props.defaultText : "" - ); + const [query, setQuery] = useState(props.defaultText ? props.defaultText : ""); // When pressing enter within the same page const inputFormControlReference = useRef(null); @@ -31,10 +28,7 @@ const MenuInlineSearch: React.FunctionComponent = ( const [inputFocus, setInputFocus] = useState(true); // can't set this inside effect or if ==> performance issue, runs to often - const responseObject = useFetch( - new UrlQuery().UrlSearchSuggestApi(query), - "get" - ); + const responseObject = useFetch(new UrlQuery().UrlSearchSuggestApi(query), "get"); useEffect(() => { if (!responseObject?.data?.length || responseObject.statusCode !== 200) { if (suggest && suggest.length >= 1) setSuggest([]); @@ -48,21 +42,12 @@ const MenuInlineSearch: React.FunctionComponent = ( }, [responseObject]); /** Submit the form */ - function onFormSubmit(e: React.FormEvent) { + function onFormSubmit(e: FormEvent) { e.preventDefault(); - Navigate( - history, - setFormFocus, - inputFormControlReference, - query, - props.callback - ); + Navigate(history, setFormFocus, inputFormControlReference, query, props.callback); } - const featuresResult = useFetch( - new UrlQuery().UrlApiFeaturesAppSettings(), - "get" - ); + const featuresResult = useFetch(new UrlQuery().UrlApiFeaturesAppSettings(), "get"); /** * is form active @@ -95,25 +80,18 @@ const MenuInlineSearch: React.FunctionComponent = ( setFormFocus(false); } } + const [keyDownIndex, setKeyDownIndex] = useState(-1); return (
    - - - + + = ({ testName="rename" /> - - {!isMarkedAsDeleted - ? MessageMoveToTrash - : MessageRestoreFromTrash} + + {!isMarkedAsDeleted ? MessageMoveToTrash : MessageRestoreFromTrash} {state.collections && state.fileIndexItem.collectionPaths && @@ -383,9 +339,7 @@ const MenuDetailView: React.FunctionComponent = ({
    {MessageIncludingColonWord} - {new Comma().CommaSpaceLastDot( - state.fileIndexItem.collectionPaths - )} + {new Comma().CommaSpaceLastDot(state.fileIndexItem.collectionPaths)}     ) : null}     diff --git a/starsky/starsky/clientapp/src/components/organisms/modal-geo/shared/add-default-click-set-marker.ts b/starsky/starsky/clientapp/src/components/organisms/modal-geo/internal/add-default-click-set-marker.ts similarity index 100% rename from starsky/starsky/clientapp/src/components/organisms/modal-geo/shared/add-default-click-set-marker.ts rename to starsky/starsky/clientapp/src/components/organisms/modal-geo/internal/add-default-click-set-marker.ts diff --git a/starsky/starsky/clientapp/src/components/organisms/modal-geo/shared/add-default-marker.ts b/starsky/starsky/clientapp/src/components/organisms/modal-geo/internal/add-default-marker.ts similarity index 100% rename from starsky/starsky/clientapp/src/components/organisms/modal-geo/shared/add-default-marker.ts rename to starsky/starsky/clientapp/src/components/organisms/modal-geo/internal/add-default-marker.ts diff --git a/starsky/starsky/clientapp/src/components/organisms/modal-geo/shared/add-map-location-center.ts b/starsky/starsky/clientapp/src/components/organisms/modal-geo/internal/add-map-location-center.ts similarity index 100% rename from starsky/starsky/clientapp/src/components/organisms/modal-geo/shared/add-map-location-center.ts rename to starsky/starsky/clientapp/src/components/organisms/modal-geo/internal/add-map-location-center.ts diff --git a/starsky/starsky/clientapp/src/components/organisms/modal-geo/shared/add-map.ts b/starsky/starsky/clientapp/src/components/organisms/modal-geo/internal/add-map.ts similarity index 100% rename from starsky/starsky/clientapp/src/components/organisms/modal-geo/shared/add-map.ts rename to starsky/starsky/clientapp/src/components/organisms/modal-geo/internal/add-map.ts diff --git a/starsky/starsky/clientapp/src/components/organisms/modal-geo/shared/blue-icon.ts b/starsky/starsky/clientapp/src/components/organisms/modal-geo/internal/blue-icon.ts similarity index 100% rename from starsky/starsky/clientapp/src/components/organisms/modal-geo/shared/blue-icon.ts rename to starsky/starsky/clientapp/src/components/organisms/modal-geo/internal/blue-icon.ts diff --git a/starsky/starsky/clientapp/src/components/organisms/modal-geo/shared/get-zoom.ts b/starsky/starsky/clientapp/src/components/organisms/modal-geo/internal/get-zoom.ts similarity index 100% rename from starsky/starsky/clientapp/src/components/organisms/modal-geo/shared/get-zoom.ts rename to starsky/starsky/clientapp/src/components/organisms/modal-geo/internal/get-zoom.ts diff --git a/starsky/starsky/clientapp/src/components/organisms/modal-geo/shared/lat-long-round.spec.ts b/starsky/starsky/clientapp/src/components/organisms/modal-geo/internal/lat-long-round.spec.ts similarity index 100% rename from starsky/starsky/clientapp/src/components/organisms/modal-geo/shared/lat-long-round.spec.ts rename to starsky/starsky/clientapp/src/components/organisms/modal-geo/internal/lat-long-round.spec.ts diff --git a/starsky/starsky/clientapp/src/components/organisms/modal-geo/shared/lat-long-round.ts b/starsky/starsky/clientapp/src/components/organisms/modal-geo/internal/lat-long-round.ts similarity index 100% rename from starsky/starsky/clientapp/src/components/organisms/modal-geo/shared/lat-long-round.ts rename to starsky/starsky/clientapp/src/components/organisms/modal-geo/internal/lat-long-round.ts diff --git a/starsky/starsky/clientapp/src/components/organisms/modal-geo/shared/on-drag.ts b/starsky/starsky/clientapp/src/components/organisms/modal-geo/internal/on-drag.ts similarity index 100% rename from starsky/starsky/clientapp/src/components/organisms/modal-geo/shared/on-drag.ts rename to starsky/starsky/clientapp/src/components/organisms/modal-geo/internal/on-drag.ts diff --git a/starsky/starsky/clientapp/src/components/organisms/modal-geo/shared/realtime-map-update.ts b/starsky/starsky/clientapp/src/components/organisms/modal-geo/internal/realtime-map-update.ts similarity index 100% rename from starsky/starsky/clientapp/src/components/organisms/modal-geo/shared/realtime-map-update.ts rename to starsky/starsky/clientapp/src/components/organisms/modal-geo/internal/realtime-map-update.ts diff --git a/starsky/starsky/clientapp/src/components/organisms/modal-geo/shared/set-marker.spec.ts b/starsky/starsky/clientapp/src/components/organisms/modal-geo/internal/set-marker.spec.ts similarity index 100% rename from starsky/starsky/clientapp/src/components/organisms/modal-geo/shared/set-marker.spec.ts rename to starsky/starsky/clientapp/src/components/organisms/modal-geo/internal/set-marker.spec.ts diff --git a/starsky/starsky/clientapp/src/components/organisms/modal-geo/shared/set-marker.ts b/starsky/starsky/clientapp/src/components/organisms/modal-geo/internal/set-marker.ts similarity index 100% rename from starsky/starsky/clientapp/src/components/organisms/modal-geo/shared/set-marker.ts rename to starsky/starsky/clientapp/src/components/organisms/modal-geo/internal/set-marker.ts diff --git a/starsky/starsky/clientapp/src/components/organisms/modal-geo/shared/update-button.spec.tsx b/starsky/starsky/clientapp/src/components/organisms/modal-geo/internal/update-button.spec.tsx similarity index 100% rename from starsky/starsky/clientapp/src/components/organisms/modal-geo/shared/update-button.spec.tsx rename to starsky/starsky/clientapp/src/components/organisms/modal-geo/internal/update-button.spec.tsx diff --git a/starsky/starsky/clientapp/src/components/organisms/modal-geo/shared/update-button.tsx b/starsky/starsky/clientapp/src/components/organisms/modal-geo/internal/update-button.tsx similarity index 100% rename from starsky/starsky/clientapp/src/components/organisms/modal-geo/shared/update-button.tsx rename to starsky/starsky/clientapp/src/components/organisms/modal-geo/internal/update-button.tsx diff --git a/starsky/starsky/clientapp/src/components/organisms/modal-geo/shared/update-geo-location.spec.ts b/starsky/starsky/clientapp/src/components/organisms/modal-geo/internal/update-geo-location.spec.ts similarity index 100% rename from starsky/starsky/clientapp/src/components/organisms/modal-geo/shared/update-geo-location.spec.ts rename to starsky/starsky/clientapp/src/components/organisms/modal-geo/internal/update-geo-location.spec.ts diff --git a/starsky/starsky/clientapp/src/components/organisms/modal-geo/shared/update-geo-location.ts b/starsky/starsky/clientapp/src/components/organisms/modal-geo/internal/update-geo-location.ts similarity index 100% rename from starsky/starsky/clientapp/src/components/organisms/modal-geo/shared/update-geo-location.ts rename to starsky/starsky/clientapp/src/components/organisms/modal-geo/internal/update-geo-location.ts diff --git a/starsky/starsky/clientapp/src/components/organisms/modal-geo/shared/update-map.ts b/starsky/starsky/clientapp/src/components/organisms/modal-geo/internal/update-map.ts similarity index 100% rename from starsky/starsky/clientapp/src/components/organisms/modal-geo/shared/update-map.ts rename to starsky/starsky/clientapp/src/components/organisms/modal-geo/internal/update-map.ts diff --git a/starsky/starsky/clientapp/src/components/organisms/modal-geo/modal-geo.tsx b/starsky/starsky/clientapp/src/components/organisms/modal-geo/modal-geo.tsx index 6f40c6c8be..0c30b049f6 100644 --- a/starsky/starsky/clientapp/src/components/organisms/modal-geo/modal-geo.tsx +++ b/starsky/starsky/clientapp/src/components/organisms/modal-geo/modal-geo.tsx @@ -7,10 +7,10 @@ import { Language } from "../../../shared/language"; import FormControl from "../../atoms/form-control/form-control"; import Modal from "../../atoms/modal/modal"; import Preloader from "../../atoms/preloader/preloader"; -import { LatLongRound } from "./shared/lat-long-round"; -import { RealtimeMapUpdate } from "./shared/realtime-map-update"; -import { UpdateButton } from "./shared/update-button"; -import { UpdateMap } from "./shared/update-map"; +import { LatLongRound } from "./internal/lat-long-round"; +import { RealtimeMapUpdate } from "./internal/realtime-map-update"; +import { UpdateButton } from "./internal/update-button"; +import { UpdateMap } from "./internal/update-map"; export interface IModalMoveFileProps { isOpen: boolean; @@ -75,14 +75,7 @@ const ModalGeo: React.FunctionComponent = ({ const mapReference = useCallback((node: HTMLDivElement | null) => { if (node !== null && mapState === null) { - UpdateMap( - node, - location, - isFormEnabled, - setLocation, - setIsLocationUpdated, - setMapState - ); + UpdateMap(node, location, isFormEnabled, setLocation, setIsLocationUpdated, setMapState); } // eslint-disable-next-line react-hooks/exhaustive-deps }, []); @@ -119,11 +112,7 @@ const ModalGeo: React.FunctionComponent = ({
    ) : null} -
    +