Skip to content

fix repo name sync time and UI #187

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 3 commits into from
Dec 30, 2022
Merged

fix repo name sync time and UI #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e133042
properly sync repoName to remote; better UI
lihebi Dec 30, 2022
682165c
allow set repoName to null
lihebi Dec 30, 2022
11c4097
remove console.log
lihebi Dec 30, 2022
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
43 changes: 42 additions & 1 deletion ui/src/lib/store/repoMetaSlice.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import produce from "immer";
import { Doc } from "yjs";
import { WebsocketProvider } from "y-websocket";
import { MyState } from ".";
import { gql } from "@apollo/client";

let serverURL;
if (window.location.protocol === "http:") {
Expand All @@ -15,9 +16,12 @@ console.log("yjs server url: ", serverURL);

export interface RepoMetaSlice {
repoName: string | null;
repoNameSyncing: boolean;
repoNameDirty: boolean;
repoId: string | null;
setRepo: (repoId: string) => void;
setRepoName: (name: string) => void;
remoteUpdateRepoName: (client) => void;
}

export const createRepoMetaSlice: StateCreator<
Expand All @@ -28,6 +32,8 @@ export const createRepoMetaSlice: StateCreator<
> = (set, get) => ({
repoId: null,
repoName: null,
repoNameSyncing: false,
repoNameDirty: false,
setRepo: (repoId: string) =>
set(
produce((state: MyState) => {
Expand All @@ -51,8 +57,43 @@ export const createRepoMetaSlice: StateCreator<
),
setRepoName: (name) => {
set(
produce((state) => {
produce((state: MyState) => {
state.repoName = name;
state.repoNameDirty = true;
})
);
},
remoteUpdateRepoName: async (client) => {
if (get().repoNameSyncing) return;
if (!get().repoNameDirty) return;
let { repoId, repoName } = get();
if (!repoId) return;
// Prevent double syncing.
set(
produce((state: MyState) => {
state.repoNameSyncing = true;
})
);
// Do the actual syncing.
await client.mutate({
mutation: gql`
mutation UpdateRepo($id: ID!, $name: String) {
updateRepo(id: $id, name: $name)
}
`,
variables: {
id: repoId,
name: repoName,
},
refetchQueries: ["GetRepos", "GetCollabRepos"],
});
set((state) =>
produce(state, (state) => {
state.repoNameSyncing = false;
// Set it as synced IF the name is still the same.
if (state.repoName === repoName) {
state.repoNameDirty = false;
}
})
);
},
Expand Down
150 changes: 111 additions & 39 deletions ui/src/pages/repo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ import ShareIcon from "@mui/icons-material/Share";
import Button from "@mui/material/Button";
import { gql, useApolloClient, useMutation } from "@apollo/client";

import { useEffect, useState, useRef, useContext } from "react";
import { useEffect, useState, useRef, useContext, memo } from "react";

import * as React from "react";

import { useStore } from "zustand";

Expand All @@ -19,32 +21,126 @@ import { Canvas } from "../components/Canvas";
import { Header } from "../components/Header";
import { Sidebar } from "../components/Sidebar";
import { useLocalStorage } from "../hooks/useLocalStorage";
import { Stack, TextField } from "@mui/material";
import { Stack, TextField, Tooltip } from "@mui/material";
import { useAuth } from "../lib/auth";
import { initParser } from "../lib/parser";

import { usePrompt } from "../lib/prompt";

const DrawerWidth = 240;
const SIDEBAR_KEY = "sidebar";

const HeaderItem = memo<any>(({ id }) => {
const store = useContext(RepoContext)!;
const repoName = useStore(store, (state) => state.repoName);
const repoNameDirty = useStore(store, (state) => state.repoNameDirty);
const setRepoName = useStore(store, (state) => state.setRepoName);
const apolloClient = useApolloClient();
const remoteUpdateRepoName = useStore(
store,
(state) => state.remoteUpdateRepoName
);
const role = useStore(store, (state) => state.role);

usePrompt(
"Repo name not saved. Do you want to leave this page?",
repoNameDirty
);

useEffect(() => {
let intervalId = setInterval(() => {
remoteUpdateRepoName(apolloClient);
}, 1000);
return () => {
clearInterval(intervalId);
};
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);

const [focus, setFocus] = useState(false);
const [enter, setEnter] = useState(false);

const textfield = (
<TextField
hiddenLabel
placeholder="Untitled"
value={repoName || ""}
size="small"
variant={focus ? undefined : "standard"}
onFocus={() => {
setFocus(true);
}}
onKeyDown={(e) => {
if (["Enter", "Escape"].includes(e.key)) {
e.preventDefault();
setFocus(false);
}
}}
onMouseEnter={() => {
setEnter(true);
}}
onMouseLeave={() => {
setEnter(false);
}}
autoFocus={focus ? true : false}
onBlur={() => {
setFocus(false);
}}
InputProps={{
...(focus
? {}
: {
disableUnderline: true,
}),
}}
sx={{
maxWidth: "100%",
border: "none",
}}
disabled={role !== RoleType.OWNER}
onChange={(e) => {
const name = e.target.value;
setRepoName(name);
}}
/>
);

return (
<Stack
direction="row"
sx={{
alignItems: "center",
}}
spacing={1}
>
{!focus && enter ? (
<Tooltip
title="Edit"
sx={{
margin: 0,
padding: 0,
}}
// placement="right"
followCursor
>
{textfield}
</Tooltip>
) : (
textfield
)}
{repoNameDirty && <Box>saving..</Box>}
</Stack>
);
});

function RepoWrapper({ children, id }) {
// this component is used to provide a foldable layout
const [open, setOpen] = useLocalStorage(SIDEBAR_KEY, true);

const store = useContext(RepoContext);
if (!store) throw new Error("Missing BearContext.Provider in the tree");
const repoName = useStore(store, (state) => state.repoName);
const setRepoName = useStore(store, (state) => state.setRepoName);
const setShareOpen = useStore(store, (state) => state.setShareOpen);
const role = useStore(store, (state) => state.role);

const [updateRepo, { error }] = useMutation(
gql`
mutation UpdateRepo($id: ID!, $name: String) {
updateRepo(id: $id, name: $name)
}
`,
{ refetchQueries: ["GetRepos", "GetCollabRepos"] }
);
const setShareOpen = useStore(store, (state) => state.setShareOpen);

return (
<Box
Expand Down Expand Up @@ -74,31 +170,7 @@ function RepoWrapper({ children, id }) {
<Header
open={open}
drawerWidth={DrawerWidth}
breadcrumbItem={
<Stack direction="row">
<TextField
hiddenLabel
placeholder="Untitled"
value={repoName || ""}
size="small"
sx={{
maxWidth: "100%",
}}
disabled={role !== RoleType.OWNER}
onChange={(e) => {
const name = e.target.value;
setRepoName(name);
updateRepo({
variables: {
id,
name,
},
});
}}
/>
{error && <Box>ERROR: {error.message}</Box>}
</Stack>
}
breadcrumbItem={<HeaderItem id={id} />}
shareButton={
<Button
endIcon={<ShareIcon />}
Expand Down