Merge remote-tracking branch 'origin/master' into chat-threads-smaller

Author: haraldschilly

src/packages/frontend/client/project.ts

@@ -73,19 +73,8 @@ export class ProjectClient {
   };
 
   // This can write small text files in one message.
-  public async write_text_file({
-    project_id,
-    path,
-    content,
-  }: {
-    project_id: string;
-    path: string;
-    content: string;
-  }): Promise<void> {
-    await this.natsApi(project_id).system.writeTextFileToProject({
-      path,
-      content,
-    });
+  public async write_text_file(opts): Promise<void> {
+    await this.writeFile(opts);
   }
 
   // writeFile -- easily write **arbitrarily large text or binary files**

src/packages/frontend/frame-editors/time-travel-editor/navigation-slider.tsx

@@ -13,7 +13,7 @@ interface Props {
   versions?: List<number>;
   version?: number;
   setVersion: (number) => void;
-  actions;
+  wallTime: (number) => number;
 }
 
 export function NavigationSlider({
@@ -31,15 +31,15 @@ function NavigationSliderNoMarks({
   version,
   versions,
   setVersion,
-  actions,
+  wallTime,
 }: Props) {
   const { isVisible } = useFrameContext();
   if (versions == null || version == null || !isVisible) {
     return null;
   }
 
   const renderTooltip = (index) => {
-    const date = actions.wallTime(versions.get(index));
+    const date = wallTime(versions.get(index));
     if (date == null) return; // shouldn't happen
     return <TimeAgo date={date} />;
   };
@@ -65,12 +65,12 @@ function NavigationSliderMarks({
   version,
   versions,
   setVersion,
-  actions,
+  wallTime,
 }: Props) {
   const { isVisible } = useFrameContext();
 
   const renderTooltip = (version) => {
-    return <TimeAgo date={new Date(actions.wallTime(version))} />;
+    return <TimeAgo date={new Date(wallTime(version))} />;
   };
 
   const marks = useMemo(() => {

src/packages/frontend/frame-editors/time-travel-editor/range-slider.tsx

@@ -21,7 +21,7 @@ interface Props {
   version1?: number;
   setVersion0: (number) => void;
   setVersion1: (number) => void;
-  actions;
+  wallTime: (number) => number;
 }
 
 export function RangeSlider({ marks, ...props }: Props & { marks?: boolean }) {
@@ -38,7 +38,7 @@ function RangeSliderNoMarks({
   version1,
   setVersion0,
   setVersion1,
-  actions,
+  wallTime,
 }: Props) {
   const { isVisible } = useFrameContext();
 
@@ -63,7 +63,7 @@ function RangeSliderNoMarks({
   };
 
   const renderTooltip = (index) => {
-    const d = actions.wallTime(versions.get(index));
+    const d = wallTime(versions.get(index));
     if (d == null) {
       // shouldn't happen
       return;
@@ -114,7 +114,7 @@ function RangeSliderMarks({
   version1,
   setVersion0,
   setVersion1,
-  actions,
+  wallTime,
 }: Props) {
   const { isVisible } = useFrameContext();
 
@@ -150,7 +150,7 @@ function RangeSliderMarks({
   };
 
   const renderTooltip = (version) => {
-    const date = new Date(actions.wallTime(version));
+    const date = new Date(wallTime(version));
     if (version == version0) {
       // Workaround fact that the left label is NOT VISIBLE
       // if it is close to the right, which makes this whole

src/packages/frontend/frame-editors/time-travel-editor/time-travel.tsx

@@ -5,7 +5,7 @@
 
 // Time travel editor react component
 
-import { useEffect, useState } from "react";
+import { useEffect, useMemo, useState } from "react";
 import { Button, Checkbox, Space, Tooltip } from "antd";
 import { Map } from "immutable";
 import {
@@ -160,6 +160,10 @@ export function TimeTravel(props: Props) {
     }
   }, [version, version0, version1, gitMode, changesMode]);
 
+  const wallTime = useMemo(() => {
+    return gitMode ? (version) => version : props.actions.wallTime;
+  }, [gitMode, props.actions]);
+
   useEffect(() => {
     saveState(props.actions, {
       id: props.id,
@@ -328,7 +332,7 @@ export function TimeTravel(props: Props) {
         setVersion={setVersion}
         versions={gitMode ? gitVersions : versions}
         marks={marks}
-        actions={props.actions}
+        wallTime={wallTime}
       />
     );
   };
@@ -345,7 +349,7 @@ export function TimeTravel(props: Props) {
         version1={version1}
         setVersion1={setVersion1}
         marks={marks}
-        actions={props.actions}
+        wallTime={wallTime}
       />
     );
   };

src/packages/nats/project-api/system.ts

@@ -21,6 +21,7 @@ export const system = {
   realpath: true,
   canonicalPaths: true,
 
+  // these should be completel deprecated -- the new streaming writeFile and readFile in nats/files are much better.
   writeTextFileToProject: true,
   readTextFileFromProject: true,