@prenta/admin 1.17.4 → 1.17.5
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/CHANGELOG.md +6 -0
- package/dist/__tests__/views/updates-tab.render.test.js +39 -1
- package/dist/__tests__/views/updates-tab.render.test.js.map +1 -1
- package/dist/views/settings/useUpdates.d.ts.map +1 -1
- package/dist/views/settings/useUpdates.js +14 -4
- package/dist/views/settings/useUpdates.js.map +1 -1
- package/package.json +5 -5
- package/src/__tests__/views/updates-tab.render.test.tsx +45 -1
- package/src/views/settings/useUpdates.ts +15 -4
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,11 @@
|
|
|
1
1
|
# @actuate-media/cms-admin
|
|
2
2
|
|
|
3
|
+
## 1.17.5
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- 83796f2: Keep a GitHub repository or token the user is typing when the Updates tab version check returns. The saved repository still fills the field when the form has not been edited.
|
|
8
|
+
|
|
3
9
|
## 1.17.4
|
|
4
10
|
|
|
5
11
|
### Patch Changes
|
|
@@ -5,10 +5,15 @@ import { fireEvent, render, screen, waitFor } from '@testing-library/react';
|
|
|
5
5
|
// The Updates tab reads `/updates/check`, saves GitHub config via
|
|
6
6
|
// PUT `/updates/config`, and opens an upgrade PR via POST `/updates/apply`.
|
|
7
7
|
let checkData;
|
|
8
|
+
/** When set, `/updates/check` waits so a test can type before the response lands. */
|
|
9
|
+
let checkGate = null;
|
|
8
10
|
const cmsApi = vi.fn(async (endpoint, options) => {
|
|
9
11
|
const method = options?.method ?? 'GET';
|
|
10
|
-
if (endpoint === '/updates/check' && method === 'GET')
|
|
12
|
+
if (endpoint === '/updates/check' && method === 'GET') {
|
|
13
|
+
if (checkGate)
|
|
14
|
+
await checkGate;
|
|
11
15
|
return { data: checkData, status: 200 };
|
|
16
|
+
}
|
|
12
17
|
if (endpoint === '/updates/config' && method === 'PUT')
|
|
13
18
|
return { data: { success: true }, status: 200 };
|
|
14
19
|
if (endpoint === '/updates/apply' && method === 'POST')
|
|
@@ -59,6 +64,7 @@ function updateAvailable(overrides = {}) {
|
|
|
59
64
|
beforeEach(() => {
|
|
60
65
|
cmsApi.mockClear();
|
|
61
66
|
checkData = upToDate();
|
|
67
|
+
checkGate = null;
|
|
62
68
|
});
|
|
63
69
|
describe('UpdatesTab', () => {
|
|
64
70
|
it('shows the current version and an up-to-date banner', async () => {
|
|
@@ -95,6 +101,38 @@ describe('UpdatesTab', () => {
|
|
|
95
101
|
expect(screen.queryByRole('button', { name: 'Create Update PR' })).toBeNull();
|
|
96
102
|
expect(screen.getByText(/Ask an administrator/i)).toBeTruthy();
|
|
97
103
|
});
|
|
104
|
+
it('keeps a repo and token typed before the check response lands (#929)', async () => {
|
|
105
|
+
let release = () => { };
|
|
106
|
+
checkGate = new Promise((resolve) => {
|
|
107
|
+
release = resolve;
|
|
108
|
+
});
|
|
109
|
+
checkData = upToDate({ githubRepo: 'saved/repo' });
|
|
110
|
+
render(_jsx(UpdatesTab, { role: "ADMIN" }));
|
|
111
|
+
const repo = screen.getByLabelText('Repository');
|
|
112
|
+
const token = screen.getByLabelText(/GitHub token/i);
|
|
113
|
+
fireEvent.change(repo, { target: { value: 'typed/repo' } });
|
|
114
|
+
fireEvent.change(token, { target: { value: 'ghp_secret' } });
|
|
115
|
+
release();
|
|
116
|
+
await screen.findByText("You're up to date!");
|
|
117
|
+
expect(repo.value).toBe('typed/repo');
|
|
118
|
+
expect(token.value).toBe('ghp_secret');
|
|
119
|
+
});
|
|
120
|
+
it('fills the repository from the check when the form is untouched', async () => {
|
|
121
|
+
checkData = upToDate({ githubRepo: 'saved/repo' });
|
|
122
|
+
render(_jsx(UpdatesTab, { role: "ADMIN" }));
|
|
123
|
+
await screen.findByText("You're up to date!");
|
|
124
|
+
expect(screen.getByLabelText('Repository').value).toBe('saved/repo');
|
|
125
|
+
});
|
|
126
|
+
it('does not clear edits when Check for Updates is clicked again', async () => {
|
|
127
|
+
checkData = upToDate({ githubRepo: 'saved/repo' });
|
|
128
|
+
render(_jsx(UpdatesTab, { role: "ADMIN" }));
|
|
129
|
+
await screen.findByText("You're up to date!");
|
|
130
|
+
const repo = screen.getByLabelText('Repository');
|
|
131
|
+
fireEvent.change(repo, { target: { value: 'typed/repo' } });
|
|
132
|
+
fireEvent.click(screen.getByRole('button', { name: 'Check for Updates' }));
|
|
133
|
+
await waitFor(() => expect(cmsApi.mock.calls.length).toBeGreaterThan(1));
|
|
134
|
+
expect(repo.value).toBe('typed/repo');
|
|
135
|
+
});
|
|
98
136
|
it('enables Save when the repo changes and persists via PUT /updates/config', async () => {
|
|
99
137
|
render(_jsx(UpdatesTab, { role: "ADMIN" }));
|
|
100
138
|
// The GitHub card renders optimistically for admins before /updates/check
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"updates-tab.render.test.js","sourceRoot":"","sources":["../../../src/__tests__/views/updates-tab.render.test.tsx"],"names":[],"mappings":";AAAA,gCAAgC;AAChC,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAA;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AAE3E,kEAAkE;AAClE,4EAA4E;AAC5E,IAAI,SAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"updates-tab.render.test.js","sourceRoot":"","sources":["../../../src/__tests__/views/updates-tab.render.test.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useUpdates.d.ts","sourceRoot":"","sources":["../../../src/views/settings/useUpdates.ts"],"names":[],"mappings":"AAOA,MAAM,MAAM,gBAAgB,GACxB,SAAS,GACT,KAAK,GACL,aAAa,GACb,UAAU,GACV,UAAU,GACV,aAAa,CAAA;AAEjB,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,gBAAgB,CAAA;CACxB;AAED,UAAU,yBAAyB;IACjC,IAAI,EAAE,MAAM,CAAA;IACZ,UAAU,EAAE,OAAO,CAAA;IACnB,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB;AAED,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,eAAe,EAAE,OAAO,CAAA;IACxB,QAAQ,CAAC,EAAE,OAAO,GAAG,OAAO,GAAG,OAAO,GAAG,UAAU,CAAA;IACnD,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,SAAS,CAAC,EAAE,mBAAmB,EAAE,CAAA;IACjC,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAA;IAC1B,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,mBAAmB,CAAC,EAAE,yBAAyB,EAAE,CAAA;IACjD,MAAM,CAAC,EAAE,eAAe,GAAG,KAAK,CAAA;IAChC,oEAAoE;IACpE,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB;AAED,UAAU,UAAU;IAClB,UAAU,EAAE,MAAM,CAAA;IAClB,WAAW,EAAE,MAAM,CAAA;CACpB;AAUD;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,EAAE,IAAI,EAAE,EAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE;;;;;;;eAMF,MAAM;kBAAY,MAAM;;;;
|
|
1
|
+
{"version":3,"file":"useUpdates.d.ts","sourceRoot":"","sources":["../../../src/views/settings/useUpdates.ts"],"names":[],"mappings":"AAOA,MAAM,MAAM,gBAAgB,GACxB,SAAS,GACT,KAAK,GACL,aAAa,GACb,UAAU,GACV,UAAU,GACV,aAAa,CAAA;AAEjB,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,gBAAgB,CAAA;CACxB;AAED,UAAU,yBAAyB;IACjC,IAAI,EAAE,MAAM,CAAA;IACZ,UAAU,EAAE,OAAO,CAAA;IACnB,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB;AAED,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,eAAe,EAAE,OAAO,CAAA;IACxB,QAAQ,CAAC,EAAE,OAAO,GAAG,OAAO,GAAG,OAAO,GAAG,UAAU,CAAA;IACnD,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,SAAS,CAAC,EAAE,mBAAmB,EAAE,CAAA;IACjC,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAA;IAC1B,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,mBAAmB,CAAC,EAAE,yBAAyB,EAAE,CAAA;IACjD,MAAM,CAAC,EAAE,eAAe,GAAG,KAAK,CAAA;IAChC,oEAAoE;IACpE,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB;AAED,UAAU,UAAU;IAClB,UAAU,EAAE,MAAM,CAAA;IAClB,WAAW,EAAE,MAAM,CAAA;CACpB;AAUD;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,EAAE,IAAI,EAAE,EAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE;;;;;;;eAMF,MAAM;kBAAY,MAAM;;;;oBAgDvC,MAAM,UAAU,SAAS,MAAM;;;;;;;;;EA0EnE"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
'use client';
|
|
2
|
-
import { useCallback, useEffect, useState } from 'react';
|
|
2
|
+
import { useCallback, useEffect, useRef, useState } from 'react';
|
|
3
3
|
import { toast } from 'sonner';
|
|
4
4
|
import { cmsApi } from '../../lib/api.js';
|
|
5
5
|
const REPO_PATTERN = /^[a-zA-Z0-9._-]+\/[a-zA-Z0-9._-]+$/;
|
|
@@ -24,21 +24,31 @@ export function useUpdates({ role }) {
|
|
|
24
24
|
const [form, setForm] = useState({ githubRepo: '', githubToken: '' });
|
|
25
25
|
const [baseline, setBaseline] = useState({ githubRepo: '', githubToken: '' });
|
|
26
26
|
const [saveState, setSaveState] = useState('idle');
|
|
27
|
+
// The check request is in flight across renders. Read the baseline from the
|
|
28
|
+
// render that started it, not from a later save or keystroke.
|
|
29
|
+
const baselineRef = useRef(baseline);
|
|
30
|
+
baselineRef.current = baseline;
|
|
27
31
|
// Optimistic until the check response confirms the server-side permission.
|
|
28
32
|
const canManage = info?.canManage ?? canManageUpdates(role);
|
|
29
33
|
const check = useCallback(async () => {
|
|
30
34
|
setChecking(true);
|
|
31
35
|
setError('');
|
|
32
36
|
setPrResult(null);
|
|
37
|
+
const baselineAtStart = baselineRef.current;
|
|
33
38
|
const res = await cmsApi('/updates/check');
|
|
34
39
|
if (res.error) {
|
|
35
40
|
setError(res.error);
|
|
36
41
|
}
|
|
37
42
|
else if (res.data) {
|
|
38
43
|
setInfo(res.data);
|
|
39
|
-
const
|
|
40
|
-
|
|
41
|
-
|
|
44
|
+
const next = { githubRepo: res.data.githubRepo ?? '', githubToken: '' };
|
|
45
|
+
// A mount-time check can take seconds. Only replace the fields when the
|
|
46
|
+
// user has not typed since this request started (#929).
|
|
47
|
+
setForm((current) => {
|
|
48
|
+
const untouched = current.githubRepo === baselineAtStart.githubRepo && current.githubToken.trim() === '';
|
|
49
|
+
return untouched ? next : current;
|
|
50
|
+
});
|
|
51
|
+
setBaseline(next);
|
|
42
52
|
}
|
|
43
53
|
setChecking(false);
|
|
44
54
|
setHasChecked(true);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useUpdates.js","sourceRoot":"","sources":["../../../src/views/settings/useUpdates.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AAEZ,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;
|
|
1
|
+
{"version":3,"file":"useUpdates.js","sourceRoot":"","sources":["../../../src/views/settings/useUpdates.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@prenta/admin",
|
|
3
|
-
"version": "1.17.
|
|
3
|
+
"version": "1.17.5",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -99,15 +99,15 @@
|
|
|
99
99
|
"typescript": "^5.7.0",
|
|
100
100
|
"vitest": "^4.1.0",
|
|
101
101
|
"@prenta/component-blocks": "0.3.1",
|
|
102
|
-
"@prenta/core": "7.2.0",
|
|
103
102
|
"@prenta/plugin-ai": "3.0.0",
|
|
104
103
|
"@prenta/plugin-blocks": "0.2.0",
|
|
104
|
+
"@prenta/core": "7.2.1",
|
|
105
105
|
"@prenta/plugin-commerce": "0.2.1",
|
|
106
106
|
"@prenta/plugin-forms": "0.1.0",
|
|
107
|
-
"@prenta/plugin-media": "0.2.0",
|
|
108
|
-
"@prenta/plugin-navigation": "0.3.0",
|
|
109
107
|
"@prenta/plugin-seo": "1.0.0",
|
|
110
|
-
"@prenta/
|
|
108
|
+
"@prenta/plugin-navigation": "0.3.0",
|
|
109
|
+
"@prenta/plugin-media": "0.2.0",
|
|
110
|
+
"@prenta/sections-react": "0.17.46"
|
|
111
111
|
},
|
|
112
112
|
"scripts": {
|
|
113
113
|
"build": "tsc --project tsconfig.json && npx @tailwindcss/cli -i src/styles/build-input.css -o dist/prenta-admin.css --minify",
|
|
@@ -5,10 +5,15 @@ import { fireEvent, render, screen, waitFor } from '@testing-library/react'
|
|
|
5
5
|
// The Updates tab reads `/updates/check`, saves GitHub config via
|
|
6
6
|
// PUT `/updates/config`, and opens an upgrade PR via POST `/updates/apply`.
|
|
7
7
|
let checkData: any
|
|
8
|
+
/** When set, `/updates/check` waits so a test can type before the response lands. */
|
|
9
|
+
let checkGate: Promise<void> | null = null
|
|
8
10
|
|
|
9
11
|
const cmsApi = vi.fn(async (endpoint: string, options?: { method?: string; body?: unknown }) => {
|
|
10
12
|
const method = options?.method ?? 'GET'
|
|
11
|
-
if (endpoint === '/updates/check' && method === 'GET')
|
|
13
|
+
if (endpoint === '/updates/check' && method === 'GET') {
|
|
14
|
+
if (checkGate) await checkGate
|
|
15
|
+
return { data: checkData, status: 200 }
|
|
16
|
+
}
|
|
12
17
|
if (endpoint === '/updates/config' && method === 'PUT')
|
|
13
18
|
return { data: { success: true }, status: 200 }
|
|
14
19
|
if (endpoint === '/updates/apply' && method === 'POST')
|
|
@@ -65,6 +70,7 @@ function updateAvailable(overrides: Record<string, unknown> = {}) {
|
|
|
65
70
|
beforeEach(() => {
|
|
66
71
|
cmsApi.mockClear()
|
|
67
72
|
checkData = upToDate()
|
|
73
|
+
checkGate = null
|
|
68
74
|
})
|
|
69
75
|
|
|
70
76
|
describe('UpdatesTab', () => {
|
|
@@ -108,6 +114,44 @@ describe('UpdatesTab', () => {
|
|
|
108
114
|
expect(screen.getByText(/Ask an administrator/i)).toBeTruthy()
|
|
109
115
|
})
|
|
110
116
|
|
|
117
|
+
it('keeps a repo and token typed before the check response lands (#929)', async () => {
|
|
118
|
+
let release: () => void = () => {}
|
|
119
|
+
checkGate = new Promise((resolve) => {
|
|
120
|
+
release = resolve
|
|
121
|
+
})
|
|
122
|
+
checkData = upToDate({ githubRepo: 'saved/repo' })
|
|
123
|
+
render(<UpdatesTab role="ADMIN" />)
|
|
124
|
+
|
|
125
|
+
const repo = screen.getByLabelText('Repository') as HTMLInputElement
|
|
126
|
+
const token = screen.getByLabelText(/GitHub token/i) as HTMLInputElement
|
|
127
|
+
fireEvent.change(repo, { target: { value: 'typed/repo' } })
|
|
128
|
+
fireEvent.change(token, { target: { value: 'ghp_secret' } })
|
|
129
|
+
|
|
130
|
+
release()
|
|
131
|
+
await screen.findByText("You're up to date!")
|
|
132
|
+
expect(repo.value).toBe('typed/repo')
|
|
133
|
+
expect(token.value).toBe('ghp_secret')
|
|
134
|
+
})
|
|
135
|
+
|
|
136
|
+
it('fills the repository from the check when the form is untouched', async () => {
|
|
137
|
+
checkData = upToDate({ githubRepo: 'saved/repo' })
|
|
138
|
+
render(<UpdatesTab role="ADMIN" />)
|
|
139
|
+
await screen.findByText("You're up to date!")
|
|
140
|
+
expect((screen.getByLabelText('Repository') as HTMLInputElement).value).toBe('saved/repo')
|
|
141
|
+
})
|
|
142
|
+
|
|
143
|
+
it('does not clear edits when Check for Updates is clicked again', async () => {
|
|
144
|
+
checkData = upToDate({ githubRepo: 'saved/repo' })
|
|
145
|
+
render(<UpdatesTab role="ADMIN" />)
|
|
146
|
+
await screen.findByText("You're up to date!")
|
|
147
|
+
|
|
148
|
+
const repo = screen.getByLabelText('Repository') as HTMLInputElement
|
|
149
|
+
fireEvent.change(repo, { target: { value: 'typed/repo' } })
|
|
150
|
+
fireEvent.click(screen.getByRole('button', { name: 'Check for Updates' }))
|
|
151
|
+
await waitFor(() => expect(cmsApi.mock.calls.length).toBeGreaterThan(1))
|
|
152
|
+
expect(repo.value).toBe('typed/repo')
|
|
153
|
+
})
|
|
154
|
+
|
|
111
155
|
it('enables Save when the repo changes and persists via PUT /updates/config', async () => {
|
|
112
156
|
render(<UpdatesTab role="ADMIN" />)
|
|
113
157
|
// The GitHub card renders optimistically for admins before /updates/check
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
'use client'
|
|
2
2
|
|
|
3
|
-
import { useCallback, useEffect, useState } from 'react'
|
|
3
|
+
import { useCallback, useEffect, useRef, useState } from 'react'
|
|
4
4
|
import { toast } from 'sonner'
|
|
5
5
|
|
|
6
6
|
import { cmsApi } from '../../lib/api.js'
|
|
@@ -74,6 +74,10 @@ export function useUpdates({ role }: { role?: string }) {
|
|
|
74
74
|
const [form, setForm] = useState<GithubForm>({ githubRepo: '', githubToken: '' })
|
|
75
75
|
const [baseline, setBaseline] = useState<GithubForm>({ githubRepo: '', githubToken: '' })
|
|
76
76
|
const [saveState, setSaveState] = useState<'idle' | 'saving' | 'success' | 'error'>('idle')
|
|
77
|
+
// The check request is in flight across renders. Read the baseline from the
|
|
78
|
+
// render that started it, not from a later save or keystroke.
|
|
79
|
+
const baselineRef = useRef(baseline)
|
|
80
|
+
baselineRef.current = baseline
|
|
77
81
|
|
|
78
82
|
// Optimistic until the check response confirms the server-side permission.
|
|
79
83
|
const canManage = info?.canManage ?? canManageUpdates(role)
|
|
@@ -82,14 +86,21 @@ export function useUpdates({ role }: { role?: string }) {
|
|
|
82
86
|
setChecking(true)
|
|
83
87
|
setError('')
|
|
84
88
|
setPrResult(null)
|
|
89
|
+
const baselineAtStart = baselineRef.current
|
|
85
90
|
const res = await cmsApi<UpdateInfo>('/updates/check')
|
|
86
91
|
if (res.error) {
|
|
87
92
|
setError(res.error)
|
|
88
93
|
} else if (res.data) {
|
|
89
94
|
setInfo(res.data)
|
|
90
|
-
const
|
|
91
|
-
|
|
92
|
-
|
|
95
|
+
const next = { githubRepo: res.data.githubRepo ?? '', githubToken: '' }
|
|
96
|
+
// A mount-time check can take seconds. Only replace the fields when the
|
|
97
|
+
// user has not typed since this request started (#929).
|
|
98
|
+
setForm((current) => {
|
|
99
|
+
const untouched =
|
|
100
|
+
current.githubRepo === baselineAtStart.githubRepo && current.githubToken.trim() === ''
|
|
101
|
+
return untouched ? next : current
|
|
102
|
+
})
|
|
103
|
+
setBaseline(next)
|
|
93
104
|
}
|
|
94
105
|
setChecking(false)
|
|
95
106
|
setHasChecked(true)
|