Skip to content

Commit 671a552

Browse files
authored
Merge pull request #396 from backstage/fix/mainstream-default-app-name
fix: correctly replace app name in file path
2 parents 9c5b2f2 + 17989b3 commit 671a552

File tree

3 files changed

+9
-14
lines changed

3 files changed

+9
-14
lines changed

src/components/common/VersionSelector.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ const VersionSelector = ({
228228
showDiff: (args: { fromVersion: string; toVersion: string }) => void
229229
showReleaseCandidates: boolean
230230
appPackage: string
231-
appName: string
231+
appName?: string
232232
}) => {
233233
const { isLoading, isDone, releaseVersions } = useFetchReleaseVersions({
234234
packageName,

src/components/pages/Home.tsx

+7-12
Original file line numberDiff line numberDiff line change
@@ -98,16 +98,13 @@ const SettingsContainer = styled.div`
9898
flex: 1;
9999
`
100100

101-
const getAppInfoInURL = (): {
102-
appPackage: string
103-
appName: string
104-
} => {
101+
const getAppInfoInURL = () => {
105102
// Parses `/?name=RnDiffApp&package=com.rndiffapp` from URL
106103
const { name, package: pkg } = queryString.parse(window.location.search)
107104

108105
return {
109106
appPackage: pkg as string,
110-
appName: name as string,
107+
appName: name as string | null,
111108
}
112109
}
113110

@@ -143,11 +140,11 @@ const Home = () => {
143140
})
144141

145142
const appInfoInURL = getAppInfoInURL()
146-
const [appName, setAppName] = useState<string>(appInfoInURL.appName)
147-
const [appPackage, setAppPackage] = useState<string>(appInfoInURL.appPackage)
143+
const [appName, setAppName] = useState(appInfoInURL.appName)
144+
const [appPackage, setAppPackage] = useState(appInfoInURL.appPackage)
148145

149146
// Avoid UI lag when typing.
150-
const deferredAppName = useDeferredValue(appName)
147+
const deferredAppName = useDeferredValue(appName || DEFAULT_APP_NAME)
151148
const deferredAppPackage = useDeferredValue(appPackage)
152149

153150
const homepageUrl = process.env.PUBLIC_URL
@@ -281,7 +278,7 @@ const Home = () => {
281278
<Input
282279
size="large"
283280
placeholder={DEFAULT_APP_NAME}
284-
value={appName}
281+
value={appName ?? ''}
285282
onChange={({ target }) => setAppName((value) => target.value)}
286283
/>
287284
</AppNameField>
@@ -322,9 +319,7 @@ const Home = () => {
322319
shouldShowDiff={shouldShowDiff}
323320
fromVersion={fromVersion}
324321
toVersion={toVersion}
325-
appName={
326-
deferredAppName !== DEFAULT_APP_NAME ? deferredAppName : ''
327-
}
322+
appName={deferredAppName}
328323
appPackage={
329324
deferredAppPackage !== DEFAULT_APP_PACKAGE
330325
? deferredAppPackage

src/utils/update-url.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export function updateURL({
1515
fromVersion: string
1616
toVersion: string
1717
appPackage: string
18-
appName: string
18+
appName?: string
1919
}) {
2020
const url = new URL(window.location.origin)
2121
url.pathname = window.location.pathname

0 commit comments

Comments
 (0)