Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(sidebar): 13451 - also define app name by app id and change icon in tab #285

Merged
merged 6 commits into from
Dec 14, 2022
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
review fix # 1
IlyaIzr committed Dec 12, 2022
commit aec7e128b20964753d22d2b1f0626c1d897c3ec3
3 changes: 0 additions & 3 deletions index.html
Original file line number Diff line number Diff line change
@@ -8,10 +8,7 @@
<meta http-equiv="X-UA-Compatible" content="ie=edge" />

<!-- Favicons display -->
<link rel="apple-touch-icon" sizes="180x180" href="/favicon/apple-touch-icon.png?v=2.0.22">
<link rel="icon" type="image/svg+xml" href="/favicon/favicon.svg">
<link rel="mask-icon" href="/favicon/safari-pinned-tab.svg?v=2.0.22" color="#444444">
<link rel="shortcut icon" href="/favicon/favicon.ico?v=2.0.22">
<meta name="apple-mobile-web-app-title" content="Disaster Ninja">
<meta name="application-name" content="Disaster Ninja">
<meta name="msapplication-TileColor" content="#da532c">
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ import { useAtom } from '@reatom/react';
import app_config from '~core/app_config';
import { i18n } from '~core/localization';
import { currentAppPropertiesResourceAtom } from '~core/shared_state/currentApplication';
import { trimLinkIfInDev } from '~utils/common';
import { transformLinkIfInDev } from '~utils/common';

type AppNameAndIconProps = {
wrapClassName?: string;
@@ -19,7 +19,7 @@ export function AppNameAndIcon({
const [{ data: appParams }] = useAtom(currentAppPropertiesResourceAtom);
const iconPath =
appParams?.sidebarIconUrl &&
trimLinkIfInDev(app_config.isDevBuild, appParams?.sidebarIconUrl);
transformLinkIfInDev(app_config.isDevBuild, appParams?.sidebarIconUrl);
IlyaIzr marked this conversation as resolved.
Show resolved Hide resolved

const appIcon = iconPath ? (
<img src={iconPath} width={24} height={24} alt={i18n.t('sidebar.icon_alt')} />
2 changes: 1 addition & 1 deletion src/utils/common/index.ts
Original file line number Diff line number Diff line change
@@ -57,7 +57,7 @@ export const removeEmpty = <T extends Record<string, unknown | null | undefined>
return acc;
}, {} as NoUndefinedField<T>);

export function trimLinkIfInDev(isDevBuild: boolean, link: string) {
export function transformLinkIfInDev(isDevBuild: boolean, link: string) {
// trim beginning of url designed for builded apps that serve static files via '/active/static'
if (isDevBuild && link?.startsWith('/active/static')) {
return link.replace('/active/static', '');
5 changes: 3 additions & 2 deletions src/utils/hooks/useBrowserTabUpdate.tsx
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
import { useEffect } from 'react';
import app_config from '~core/app_config';
import { trimLinkIfInDev } from '~utils/common';
import { transformLinkIfInDev } from '~utils/common';

export function useBrowserTabUpdateEffect(iconPath?: string) {
IlyaIzr marked this conversation as resolved.
Show resolved Hide resolved
// change tab icon (not expected to work in Safari https://stackoverflow.com/questions/63781987/cant-change-favicon-with-javascript-in-safari)
useEffect(() => {
if (!iconPath) return;
const link = trimLinkIfInDev(app_config.isDevBuild, iconPath);
const link = transformLinkIfInDev(app_config.isDevBuild, iconPath);
const linkElements = document.querySelectorAll(
"link[rel~='icon']",
) as NodeListOf<HTMLLinkElement>;
linkElements.forEach((linkEl) => {
// keep url icons versions
const linkUrl = new URL(linkEl.href);
// keep url search to avoid unexpected caching
linkEl.href = link + linkUrl.search;
});
}, [iconPath]);