Skip to content

Use project name from URL param on import project #424

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Oct 28, 2024
Merged

Use project name from URL param on import project #424

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc8dffa
Use project name from URL param on import project
microbit-robert Oct 25, 2024
30490f1
Same result with less state setting
microbit-robert Oct 28, 2024
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
22 changes: 11 additions & 11 deletions src/pages/ImportPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
VStack,
} from "@chakra-ui/react";
import { Project } from "@microbit/makecode-embed/react";
import { ReactNode, useCallback, useEffect, useMemo, useState } from "react";
import { ReactNode, useCallback, useEffect, useState } from "react";
import { FormattedMessage, IntlShape, useIntl } from "react-intl";
import { useNavigate } from "react-router";
import { useSearchParams } from "react-router-dom";
Expand All @@ -19,11 +19,11 @@ import DefaultPageLayout, {
import { useConnectionStage } from "../connection-stage-hooks";
import { useDeployment } from "../deployment";
import { useProject } from "../hooks/project-hooks";
import { useLogging } from "../logging/logging-hooks";
import { MicrobitOrgResource } from "../model";
import { defaultProjectName, validateProjectName } from "../project-name";
import { useStore } from "../store";
import { createDataSamplesPageUrl } from "../urls";
import { useLogging } from "../logging/logging-hooks";

const ImportPage = () => {
const intl = useIntl();
Expand All @@ -36,15 +36,15 @@ const ImportPage = () => {
const [project, setProject] = useState<Project>();
const logging = useLogging();

const resource = useMemo(() => {
const id = params.get("id");
const project = params.get("project");
const name = params.get("name");
return id && name && project ? { id, project, name } : undefined;
}, [params]);

useEffect(() => {
const updateAsync = async () => {
const resourceId = params.get("id");
const resourceProject = params.get("project");
const resourceName = params.get("name");
const resource =
resourceId && resourceProject && resourceName
? { id: resourceId, project: resourceProject, name: resourceName }
: undefined;
if (!resource || !activitiesBaseUrl) {
return;
}
Expand All @@ -55,7 +55,7 @@ const ImportPage = () => {
intl
);
setProject(project);
setName(project.header?.name ?? defaultProjectName);
setName(resourceName ?? defaultProjectName);
} catch (e) {
// Log the fetch error, but fallback to new blank session by default.
logging.error(e);
Expand All @@ -64,7 +64,7 @@ const ImportPage = () => {
void updateAsync().then(() => {
setFetchingProject(false);
});
}, [activitiesBaseUrl, intl, logging, resource]);
}, [activitiesBaseUrl, intl, logging, params]);

const loadProject = useStore((s) => s.loadProject);
const newSession = useStore((s) => s.newSession);
Expand Down
Loading