Radish alpha
r
radicle-explorer
rad:z4V1sjrXqjvFdnCUbxPFqd5p4DtH5
Radicle web interface
Radicle
Git
Commits › f914d94
Reduce requests when switching between History and Source view
Sebastian Martinez committed 1 year ago
commit f914d940384c1087a0f39540bf7a11ad2cbab5eb
parent 5174cda
1 file changed +52 -9
modified src/views/projects/router.ts
@@ -269,7 +269,7 @@ export async function loadProjectRoute(
    if (route.resource === "project.source") {

      return await loadTreeView(route, previousLoaded);

    } else if (route.resource === "project.history") {
- 
      return await loadHistoryView(route);
+ 
      return await loadHistoryView(route, previousLoaded);

    } else if (route.resource === "project.commit") {

      const [project, commit, seedingPolicy, node] = await Promise.all([

        api.project.getById(route.project),
@@ -386,25 +386,31 @@ async function loadTreeView(
  let projectPromise: Promise<Project>;

  let seedingPolicyPromise: Promise<SeedingPolicy>;

  let peersPromise: Promise<Remote[]>;
+ 
  let nodePromise: Promise<Partial<Node>>;

  if (
- 
    previousLoaded.resource === "project.source" &&
+ 
    (previousLoaded.resource === "project.source" ||
+ 
      previousLoaded.resource === "project.history") &&

    previousLoaded.params.project.id === route.project &&

    previousLoaded.params.peer === route.peer

  ) {

    projectPromise = Promise.resolve(previousLoaded.params.project);

    peersPromise = Promise.resolve(previousLoaded.params.peers);

    seedingPolicyPromise = Promise.resolve(previousLoaded.params.seedingPolicy);
+ 
    nodePromise = Promise.resolve({
+ 
      avatarUrl: previousLoaded.params.nodeAvatarUrl,
+ 
    });

  } else {

    projectPromise = api.project.getById(route.project);

    peersPromise = api.project.getAllRemotes(route.project);

    seedingPolicyPromise = api.getPolicyById(route.project);
+ 
    nodePromise = api.getNode();

  }



  const [project, peers, seedingPolicy, node] = await Promise.all([

    projectPromise,

    peersPromise,

    seedingPolicyPromise,
- 
    api.getNode(),
+ 
    nodePromise,

  ]);



  let branchMap: Record<string, string> = {
@@ -508,15 +514,39 @@ async function loadBlob(
}

async function loadHistoryView(

  route: ProjectHistoryRoute,
+ 
  previousLoaded: LoadedRoute,

): Promise<ProjectLoadedRoute> {

  const api = new HttpdClient(route.node);
+ 
  let projectPromise: Promise<Project>;
+ 
  let seedingPolicyPromise: Promise<SeedingPolicy>;
+ 
  let peersPromise: Promise<Remote[]>;
+ 
  let nodePromise: Promise<Partial<Node>>;
+ 
  if (
+ 
    (previousLoaded.resource === "project.source" ||
+ 
      previousLoaded.resource === "project.history") &&
+ 
    previousLoaded.params.project.id === route.project &&
+ 
    previousLoaded.params.peer === route.peer
+ 
  ) {
+ 
    projectPromise = Promise.resolve(previousLoaded.params.project);
+ 
    peersPromise = Promise.resolve(previousLoaded.params.peers);
+ 
    seedingPolicyPromise = Promise.resolve(previousLoaded.params.seedingPolicy);
+ 
    nodePromise = Promise.resolve({
+ 
      avatarUrl: previousLoaded.params.nodeAvatarUrl,
+ 
    });
+ 
  } else {
+ 
    projectPromise = api.project.getById(route.project);
+ 
    peersPromise = api.project.getAllRemotes(route.project);
+ 
    seedingPolicyPromise = api.getPolicyById(route.project);
+ 
    nodePromise = api.getNode();
+ 
  }
+ 


  const [project, peers, seedingPolicy, branchMap, node] = await Promise.all([
- 
    api.project.getById(route.project),
- 
    api.project.getAllRemotes(route.project),
- 
    api.getPolicyById(route.project),
+ 
    projectPromise,
+ 
    peersPromise,
+ 
    seedingPolicyPromise,

    getPeerBranches(api, route.project, route.peer),
- 
    api.getNode(),
+ 
    nodePromise,

  ]);



  let commitId;
@@ -534,9 +564,22 @@ async function loadHistoryView(
    );

  }
+ 
  let treePromise: Promise<Tree>;
+
+ 
  if (
+ 
    (previousLoaded.resource === "project.source" ||
+ 
      previousLoaded.resource === "project.history") &&
+ 
    previousLoaded.params.project.id === route.project &&
+ 
    previousLoaded.params.commit === commitId
+ 
  ) {
+ 
    treePromise = Promise.resolve(previousLoaded.params.tree);
+ 
  } else {
+ 
    treePromise = api.project.getTree(route.project, commitId);
+ 
  }
+ 


  const [tree, commitHeaders] = await Promise.all([
- 
    api.project.getTree(route.project, commitId),
- 
    await api.project.getAllCommits(project.id, {
+ 
    treePromise,
+ 
    api.project.getAllCommits(project.id, {

      parent: commitId,

      page: 0,

      perPage: config.source.commitsPerPage,