@google/gemini-cli 0.18.0-preview.2 → 0.18.0-preview.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/google-gemini-cli-0.18.0-preview.2.tgz +0 -0
- package/dist/package.json +2 -2
- package/dist/src/generated/git-commit.d.ts +2 -2
- package/dist/src/generated/git-commit.js +2 -2
- package/dist/src/ui/components/AppHeader.js +3 -17
- package/dist/src/ui/components/AppHeader.js.map +1 -1
- package/dist/src/ui/components/AppHeader.test.js +10 -4
- package/dist/src/ui/components/AppHeader.test.js.map +1 -1
- package/dist/src/ui/hooks/useBanner.d.ts +14 -0
- package/dist/src/ui/hooks/useBanner.js +48 -0
- package/dist/src/ui/hooks/useBanner.js.map +1 -0
- package/dist/src/ui/hooks/useBanner.test.d.ts +6 -0
- package/dist/src/ui/hooks/useBanner.test.js +92 -0
- package/dist/src/ui/hooks/useBanner.test.js.map +1 -0
- package/dist/src/utils/persistentState.d.ts +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +3 -3
- package/dist/google-gemini-cli-0.18.0-preview.1.tgz +0 -0
|
Binary file
|
package/dist/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@google/gemini-cli",
|
|
3
|
-
"version": "0.18.0-preview.
|
|
3
|
+
"version": "0.18.0-preview.3",
|
|
4
4
|
"description": "Gemini CLI",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
"dist"
|
|
26
26
|
],
|
|
27
27
|
"config": {
|
|
28
|
-
"sandboxImageUri": "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.18.0-preview.
|
|
28
|
+
"sandboxImageUri": "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.18.0-preview.3"
|
|
29
29
|
},
|
|
30
30
|
"dependencies": {
|
|
31
31
|
"@google/gemini-cli-core": "file:../core",
|
|
@@ -3,5 +3,5 @@
|
|
|
3
3
|
* Copyright 2025 Google LLC
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
-
export declare const GIT_COMMIT_INFO = "
|
|
7
|
-
export declare const CLI_VERSION = "0.18.0-preview.
|
|
6
|
+
export declare const GIT_COMMIT_INFO = "ea3d022c8";
|
|
7
|
+
export declare const CLI_VERSION = "0.18.0-preview.3";
|
|
@@ -5,6 +5,6 @@
|
|
|
5
5
|
*/
|
|
6
6
|
// This file is auto-generated by the build script (scripts/generate-git-commit-info.js)
|
|
7
7
|
// Do not edit this file manually.
|
|
8
|
-
export const GIT_COMMIT_INFO = '
|
|
9
|
-
export const CLI_VERSION = '0.18.0-preview.
|
|
8
|
+
export const GIT_COMMIT_INFO = 'ea3d022c8';
|
|
9
|
+
export const CLI_VERSION = '0.18.0-preview.3';
|
|
10
10
|
//# sourceMappingURL=git-commit.js.map
|
|
@@ -10,27 +10,13 @@ import { Tips } from './Tips.js';
|
|
|
10
10
|
import { useSettings } from '../contexts/SettingsContext.js';
|
|
11
11
|
import { useConfig } from '../contexts/ConfigContext.js';
|
|
12
12
|
import { useUIState } from '../contexts/UIStateContext.js';
|
|
13
|
-
import { persistentState } from '../../utils/persistentState.js';
|
|
14
|
-
import { useEffect, useRef, useState } from 'react';
|
|
15
13
|
import { Banner } from './Banner.js';
|
|
14
|
+
import { useBanner } from '../hooks/useBanner.js';
|
|
16
15
|
export const AppHeader = ({ version }) => {
|
|
17
16
|
const settings = useSettings();
|
|
18
17
|
const config = useConfig();
|
|
19
18
|
const { nightly, mainAreaWidth, bannerData, bannerVisible } = useUIState();
|
|
20
|
-
const
|
|
21
|
-
|
|
22
|
-
const showDefaultBanner = warningText === '' &&
|
|
23
|
-
!config.getPreviewFeatures() &&
|
|
24
|
-
defaultBannerShownCount < 5;
|
|
25
|
-
const bannerText = showDefaultBanner ? defaultText : warningText;
|
|
26
|
-
const hasIncrementedRef = useRef(false);
|
|
27
|
-
useEffect(() => {
|
|
28
|
-
if (showDefaultBanner && defaultText && !hasIncrementedRef.current) {
|
|
29
|
-
hasIncrementedRef.current = true;
|
|
30
|
-
const current = persistentState.get('defaultBannerShownCount') || 0;
|
|
31
|
-
persistentState.set('defaultBannerShownCount', current + 1);
|
|
32
|
-
}
|
|
33
|
-
}, [showDefaultBanner, defaultText]);
|
|
34
|
-
return (_jsxs(Box, { flexDirection: "column", children: [!(settings.merged.ui?.hideBanner || config.getScreenReader()) && (_jsxs(_Fragment, { children: [_jsx(Header, { version: version, nightly: nightly }), bannerVisible && bannerText && (_jsx(Banner, { width: mainAreaWidth, bannerText: bannerText, isWarning: warningText !== '' }))] })), !(settings.merged.ui?.hideTips || config.getScreenReader()) && (_jsx(Tips, { config: config }))] }));
|
|
19
|
+
const { bannerText } = useBanner(bannerData, config);
|
|
20
|
+
return (_jsxs(Box, { flexDirection: "column", children: [!(settings.merged.ui?.hideBanner || config.getScreenReader()) && (_jsxs(_Fragment, { children: [_jsx(Header, { version: version, nightly: nightly }), bannerVisible && bannerText && (_jsx(Banner, { width: mainAreaWidth, bannerText: bannerText, isWarning: bannerData.warningText !== '' }))] })), !(settings.merged.ui?.hideTips || config.getScreenReader()) && (_jsx(Tips, { config: config }))] }));
|
|
35
21
|
};
|
|
36
22
|
//# sourceMappingURL=AppHeader.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AppHeader.js","sourceRoot":"","sources":["../../../../src/ui/components/AppHeader.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"AppHeader.js","sourceRoot":"","sources":["../../../../src/ui/components/AppHeader.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAMlD,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,EAAE,OAAO,EAAkB,EAAE,EAAE;IACvD,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAC3B,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,aAAa,EAAE,GAAG,UAAU,EAAE,CAAC;IAE3E,MAAM,EAAE,UAAU,EAAE,GAAG,SAAS,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IAErD,OAAO,CACL,MAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,aACxB,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,EAAE,UAAU,IAAI,MAAM,CAAC,eAAe,EAAE,CAAC,IAAI,CAChE,8BACE,KAAC,MAAM,IAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,GAAI,EAC7C,aAAa,IAAI,UAAU,IAAI,CAC9B,KAAC,MAAM,IACL,KAAK,EAAE,aAAa,EACpB,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,UAAU,CAAC,WAAW,KAAK,EAAE,GACxC,CACH,IACA,CACJ,EACA,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,EAAE,QAAQ,IAAI,MAAM,CAAC,eAAe,EAAE,CAAC,IAAI,CAC9D,KAAC,IAAI,IAAC,MAAM,EAAE,MAAM,GAAI,CACzB,IACG,CACP,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -8,6 +8,7 @@ import { renderWithProviders } from '../../test-utils/render.js';
|
|
|
8
8
|
import { AppHeader } from './AppHeader.js';
|
|
9
9
|
import { describe, it, expect, vi, beforeEach } from 'vitest';
|
|
10
10
|
import { makeFakeConfig } from '@google/gemini-cli-core';
|
|
11
|
+
import crypto from 'node:crypto';
|
|
11
12
|
const persistentStateMock = vi.hoisted(() => ({
|
|
12
13
|
get: vi.fn(),
|
|
13
14
|
set: vi.fn(),
|
|
@@ -21,7 +22,7 @@ vi.mock('../utils/terminalSetup.js', () => ({
|
|
|
21
22
|
describe('<AppHeader />', () => {
|
|
22
23
|
beforeEach(() => {
|
|
23
24
|
vi.clearAllMocks();
|
|
24
|
-
persistentStateMock.get.mockReturnValue(
|
|
25
|
+
persistentStateMock.get.mockReturnValue({});
|
|
25
26
|
});
|
|
26
27
|
it('should render the banner with default text', () => {
|
|
27
28
|
const mockConfig = makeFakeConfig();
|
|
@@ -105,8 +106,8 @@ describe('<AppHeader />', () => {
|
|
|
105
106
|
expect(lastFrame()).toMatchSnapshot();
|
|
106
107
|
unmount();
|
|
107
108
|
});
|
|
108
|
-
it('should increment the
|
|
109
|
-
persistentStateMock.get.mockReturnValue(
|
|
109
|
+
it('should increment the version count when default banner is displayed', () => {
|
|
110
|
+
persistentStateMock.get.mockReturnValue({});
|
|
110
111
|
const mockConfig = makeFakeConfig();
|
|
111
112
|
const uiState = {
|
|
112
113
|
bannerData: {
|
|
@@ -118,7 +119,12 @@ describe('<AppHeader />', () => {
|
|
|
118
119
|
config: mockConfig,
|
|
119
120
|
uiState,
|
|
120
121
|
});
|
|
121
|
-
expect(persistentStateMock.set).toHaveBeenCalledWith('defaultBannerShownCount',
|
|
122
|
+
expect(persistentStateMock.set).toHaveBeenCalledWith('defaultBannerShownCount', {
|
|
123
|
+
[crypto
|
|
124
|
+
.createHash('sha256')
|
|
125
|
+
.update(uiState.bannerData.defaultText)
|
|
126
|
+
.digest('hex')]: 1,
|
|
127
|
+
});
|
|
122
128
|
unmount();
|
|
123
129
|
});
|
|
124
130
|
it('should render banner text with unescaped newlines', () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AppHeader.test.js","sourceRoot":"","sources":["../../../../src/ui/components/AppHeader.test.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"AppHeader.test.js","sourceRoot":"","sources":["../../../../src/ui/components/AppHeader.test.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import type { Config } from '@google/gemini-cli-core';
|
|
7
|
+
interface BannerData {
|
|
8
|
+
defaultText: string;
|
|
9
|
+
warningText: string;
|
|
10
|
+
}
|
|
11
|
+
export declare function useBanner(bannerData: BannerData, config: Config): {
|
|
12
|
+
bannerText: string;
|
|
13
|
+
};
|
|
14
|
+
export {};
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { useState, useEffect, useRef } from 'react';
|
|
7
|
+
import { persistentState } from '../../utils/persistentState.js';
|
|
8
|
+
import crypto from 'node:crypto';
|
|
9
|
+
const DEFAULT_MAX_BANNER_SHOWN_COUNT = 5;
|
|
10
|
+
export function useBanner(bannerData, config) {
|
|
11
|
+
const { defaultText, warningText } = bannerData;
|
|
12
|
+
const [previewEnabled, setPreviewEnabled] = useState(config.getPreviewFeatures());
|
|
13
|
+
useEffect(() => {
|
|
14
|
+
const isEnabled = config.getPreviewFeatures();
|
|
15
|
+
if (isEnabled !== previewEnabled) {
|
|
16
|
+
setPreviewEnabled(isEnabled);
|
|
17
|
+
}
|
|
18
|
+
}, [config, previewEnabled]);
|
|
19
|
+
const [bannerCounts] = useState(() => persistentState.get('defaultBannerShownCount') || {});
|
|
20
|
+
const hashedText = crypto
|
|
21
|
+
.createHash('sha256')
|
|
22
|
+
.update(defaultText)
|
|
23
|
+
.digest('hex');
|
|
24
|
+
const currentBannerCount = bannerCounts[hashedText] || 0;
|
|
25
|
+
const showDefaultBanner = warningText === '' &&
|
|
26
|
+
!previewEnabled &&
|
|
27
|
+
currentBannerCount < DEFAULT_MAX_BANNER_SHOWN_COUNT;
|
|
28
|
+
const rawBannerText = showDefaultBanner ? defaultText : warningText;
|
|
29
|
+
const bannerText = rawBannerText.replace(/\\n/g, '\n');
|
|
30
|
+
const lastIncrementedKey = useRef(null);
|
|
31
|
+
useEffect(() => {
|
|
32
|
+
if (showDefaultBanner && defaultText) {
|
|
33
|
+
if (lastIncrementedKey.current !== defaultText) {
|
|
34
|
+
lastIncrementedKey.current = defaultText;
|
|
35
|
+
const allCounts = persistentState.get('defaultBannerShownCount') || {};
|
|
36
|
+
const current = allCounts[hashedText] || 0;
|
|
37
|
+
persistentState.set('defaultBannerShownCount', {
|
|
38
|
+
...allCounts,
|
|
39
|
+
[hashedText]: current + 1,
|
|
40
|
+
});
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
}, [showDefaultBanner, defaultText, hashedText]);
|
|
44
|
+
return {
|
|
45
|
+
bannerText,
|
|
46
|
+
};
|
|
47
|
+
}
|
|
48
|
+
//# sourceMappingURL=useBanner.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"useBanner.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useBanner.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAEjE,OAAO,MAAM,MAAM,aAAa,CAAC;AAEjC,MAAM,8BAA8B,GAAG,CAAC,CAAC;AAOzC,MAAM,UAAU,SAAS,CAAC,UAAsB,EAAE,MAAc;IAC9D,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,GAAG,UAAU,CAAC;IAEhD,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,QAAQ,CAClD,MAAM,CAAC,kBAAkB,EAAE,CAC5B,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,SAAS,GAAG,MAAM,CAAC,kBAAkB,EAAE,CAAC;QAC9C,IAAI,SAAS,KAAK,cAAc,EAAE,CAAC;YACjC,iBAAiB,CAAC,SAAS,CAAC,CAAC;QAC/B,CAAC;IACH,CAAC,EAAE,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC;IAE7B,MAAM,CAAC,YAAY,CAAC,GAAG,QAAQ,CAC7B,GAAG,EAAE,CAAC,eAAe,CAAC,GAAG,CAAC,yBAAyB,CAAC,IAAI,EAAE,CAC3D,CAAC;IAEF,MAAM,UAAU,GAAG,MAAM;SACtB,UAAU,CAAC,QAAQ,CAAC;SACpB,MAAM,CAAC,WAAW,CAAC;SACnB,MAAM,CAAC,KAAK,CAAC,CAAC;IAEjB,MAAM,kBAAkB,GAAG,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IAEzD,MAAM,iBAAiB,GACrB,WAAW,KAAK,EAAE;QAClB,CAAC,cAAc;QACf,kBAAkB,GAAG,8BAA8B,CAAC;IAEtD,MAAM,aAAa,GAAG,iBAAiB,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC;IACpE,MAAM,UAAU,GAAG,aAAa,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAEvD,MAAM,kBAAkB,GAAG,MAAM,CAAgB,IAAI,CAAC,CAAC;IAEvD,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,iBAAiB,IAAI,WAAW,EAAE,CAAC;YACrC,IAAI,kBAAkB,CAAC,OAAO,KAAK,WAAW,EAAE,CAAC;gBAC/C,kBAAkB,CAAC,OAAO,GAAG,WAAW,CAAC;gBAEzC,MAAM,SAAS,GAAG,eAAe,CAAC,GAAG,CAAC,yBAAyB,CAAC,IAAI,EAAE,CAAC;gBACvE,MAAM,OAAO,GAAG,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;gBAE3C,eAAe,CAAC,GAAG,CAAC,yBAAyB,EAAE;oBAC7C,GAAG,SAAS;oBACZ,CAAC,UAAU,CAAC,EAAE,OAAO,GAAG,CAAC;iBAC1B,CAAC,CAAC;YACL,CAAC;QACH,CAAC;IACH,CAAC,EAAE,CAAC,iBAAiB,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC,CAAC;IAEjD,OAAO;QACL,UAAU;KACX,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,92 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { describe, it, expect, vi, beforeEach, } from 'vitest';
|
|
7
|
+
import { renderHook } from '../../test-utils/render.js';
|
|
8
|
+
import { useBanner } from './useBanner.js';
|
|
9
|
+
import { persistentState } from '../../utils/persistentState.js';
|
|
10
|
+
import crypto from 'node:crypto';
|
|
11
|
+
vi.mock('../../utils/persistentState.js', () => ({
|
|
12
|
+
persistentState: {
|
|
13
|
+
get: vi.fn(),
|
|
14
|
+
set: vi.fn(),
|
|
15
|
+
},
|
|
16
|
+
}));
|
|
17
|
+
vi.mock('../semantic-colors.js', () => ({
|
|
18
|
+
theme: {
|
|
19
|
+
status: {
|
|
20
|
+
warning: 'mock-warning-color',
|
|
21
|
+
},
|
|
22
|
+
},
|
|
23
|
+
}));
|
|
24
|
+
vi.mock('../colors.js', () => ({
|
|
25
|
+
Colors: {
|
|
26
|
+
AccentBlue: 'mock-accent-blue',
|
|
27
|
+
},
|
|
28
|
+
}));
|
|
29
|
+
describe('useBanner', () => {
|
|
30
|
+
let mockConfig;
|
|
31
|
+
const mockedPersistentStateGet = persistentState.get;
|
|
32
|
+
const mockedPersistentStateSet = persistentState.set;
|
|
33
|
+
const defaultBannerData = {
|
|
34
|
+
defaultText: 'Standard Banner',
|
|
35
|
+
warningText: '',
|
|
36
|
+
};
|
|
37
|
+
beforeEach(() => {
|
|
38
|
+
vi.resetAllMocks();
|
|
39
|
+
// Initialize the mock config with default behavior
|
|
40
|
+
mockConfig = {
|
|
41
|
+
getPreviewFeatures: vi.fn().mockReturnValue(false),
|
|
42
|
+
};
|
|
43
|
+
// Default persistentState behavior: return empty object (no counts)
|
|
44
|
+
mockedPersistentStateGet.mockReturnValue({});
|
|
45
|
+
});
|
|
46
|
+
it('should return warning text and warning color if warningText is present', () => {
|
|
47
|
+
const data = { defaultText: 'Standard', warningText: 'Critical Error' };
|
|
48
|
+
const { result } = renderHook(() => useBanner(data, mockConfig));
|
|
49
|
+
expect(result.current.bannerText).toBe('Critical Error');
|
|
50
|
+
});
|
|
51
|
+
it('should NOT show default banner if preview features are enabled in config', () => {
|
|
52
|
+
// Simulate Preview Features Enabled
|
|
53
|
+
mockConfig.getPreviewFeatures.mockReturnValue(true);
|
|
54
|
+
const { result } = renderHook(() => useBanner(defaultBannerData, mockConfig));
|
|
55
|
+
// Should fall back to warningText (which is empty)
|
|
56
|
+
expect(result.current.bannerText).toBe('');
|
|
57
|
+
});
|
|
58
|
+
it('should hide banner if show count exceeds max limit (Legacy format)', () => {
|
|
59
|
+
mockedPersistentStateGet.mockReturnValue({
|
|
60
|
+
[crypto
|
|
61
|
+
.createHash('sha256')
|
|
62
|
+
.update(defaultBannerData.defaultText)
|
|
63
|
+
.digest('hex')]: 5,
|
|
64
|
+
});
|
|
65
|
+
const { result } = renderHook(() => useBanner(defaultBannerData, mockConfig));
|
|
66
|
+
expect(result.current.bannerText).toBe('');
|
|
67
|
+
});
|
|
68
|
+
it('should increment the persistent count when banner is shown', () => {
|
|
69
|
+
const data = { defaultText: 'Tracker', warningText: '' };
|
|
70
|
+
// Current count is 1
|
|
71
|
+
mockedPersistentStateGet.mockReturnValue({
|
|
72
|
+
[crypto.createHash('sha256').update(data.defaultText).digest('hex')]: 1,
|
|
73
|
+
});
|
|
74
|
+
renderHook(() => useBanner(data, mockConfig));
|
|
75
|
+
// Expect set to be called with incremented count
|
|
76
|
+
expect(mockedPersistentStateSet).toHaveBeenCalledWith('defaultBannerShownCount', {
|
|
77
|
+
[crypto.createHash('sha256').update(data.defaultText).digest('hex')]: 2,
|
|
78
|
+
});
|
|
79
|
+
});
|
|
80
|
+
it('should NOT increment count if warning text is shown instead', () => {
|
|
81
|
+
const data = { defaultText: 'Standard', warningText: 'Warning' };
|
|
82
|
+
renderHook(() => useBanner(data, mockConfig));
|
|
83
|
+
// Since warning text takes precedence, default banner logic (and increment) is skipped
|
|
84
|
+
expect(mockedPersistentStateSet).not.toHaveBeenCalled();
|
|
85
|
+
});
|
|
86
|
+
it('should handle newline replacements', () => {
|
|
87
|
+
const data = { defaultText: 'Line1\\nLine2', warningText: '' };
|
|
88
|
+
const { result } = renderHook(() => useBanner(data, mockConfig));
|
|
89
|
+
expect(result.current.bannerText).toBe('Line1\nLine2');
|
|
90
|
+
});
|
|
91
|
+
});
|
|
92
|
+
//# sourceMappingURL=useBanner.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"useBanner.test.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useBanner.test.ts"],"names":[],"mappings":"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"}
|