Stage

.eslintignore

@@ -1 +0,0 @@
-src/components/shared/react-json-editor-ajrm

package.json

@@ -1,6 +1,6 @@
 {
   "name": "harperdb-studio",
-  "version": "4.2.10",
+  "version": "4.2.11",
   "description": "A UI for HarperDB",
   "deploymentUrl": "studio.harperdb.io",
   "private": true,

src/components/instance/functions/manage/index.js

@@ -25,30 +25,43 @@ function ManageIndex({ refreshCustomFunctions, loading }) {
   const [majorVersion, minorVersion] = (registration?.version || '').split('.');
   const supportsStaticRoutes = parseFloat(`${majorVersion}.${minorVersion}`) < 4.1;
   const restarting = useStoreState(instanceState, (s) => s.restarting_service === 'custom_functions');
+  // NOTE: use the operationsApi server for cf_server_url in the future.
   const cf_server_url = useStoreState(instanceState, (s) => s.custom_functions_url || `${s.url.split(':').slice(0, -1).join(':')}:${s.custom_functions?.port}`);
   const baseUrl = `/o/${customer_id}/i/${compute_stack_id}/functions/${action}`;
 
-  useEffect(() => {
+  const routeToDefaultProject = () => {
+
     const hasProjects = custom_functions?.endpoints && Object.keys(custom_functions?.endpoints).length;
     const projectIsInEndpoints = custom_functions?.endpoints && Object.keys(custom_functions?.endpoints).includes(project);
 
+    let targetUrl;
+
     if (hasProjects && project && !projectIsInEndpoints) {
+
       const firstProject = project && Object.keys(custom_functions?.endpoints)[0];
-      navigate(`${baseUrl}/${firstProject}`);
+      targetUrl = `${baseUrl}/${firstProject}`;
+
     } else if (hasProjects && project && !file) {
+
       const firstRouteFile = project && custom_functions?.endpoints[project]?.routes[0];
       const firstHelperFile = project && custom_functions?.endpoints[project]?.helpers[0];
       const defaultType = firstRouteFile ? 'routes' : 'helpers';
-      navigate(`${baseUrl}/${project}/${defaultType}/${firstRouteFile || firstHelperFile}`);
+      targetUrl = `${baseUrl}/${project}/${defaultType}/${firstRouteFile || firstHelperFile}`;
+
     } else if (hasProjects && !project) {
+
       const firstProject = Object.keys(custom_functions?.endpoints)[0];
-      navigate(`${baseUrl}/${firstProject}`);
+      targetUrl = `${baseUrl}/${firstProject}`;
+
     } else if (!hasProjects) {
-      navigate(baseUrl);
+
+      targetUrl = baseUrl;
     }
-  }, [custom_functions?.endpoints, customer_id, compute_stack_id, navigate, action, project, file, baseUrl]);
 
-  useInterval(async () => {
+    navigate(targetUrl);
+  }
+
+  const waitForRestartToComplete = async () => {
     if (cf_server_url && restarting) {
       try {
         await fetch(cf_server_url);
@@ -60,7 +73,10 @@ function ManageIndex({ refreshCustomFunctions, loading }) {
         console.log(e);
       }
     }
-  }, 1000);
+  }
+
+  useEffect(routeToDefaultProject, [custom_functions?.endpoints, customer_id, compute_stack_id, navigate, action, project, file, baseUrl]);
+  useInterval(waitForRestartToComplete, 1000);
 
   return (
     <Row id="functions">

src/components/instance/status/SystemInfo.js

@@ -28,32 +28,11 @@ function SystemInfo() {
   const [lastUpdate, setLastUpdate] = useState(null);
 
   async function fetchSystemInfo(useCache=false) {
-
     if (useCache) {
-
-      await updateSystemInfo({
-        auth,
-        url,
-        is_local,
-        signal: controller.signal,
-        refresh: !!systemInfo,
-        cachedSystemInfo: systemInfo,
-        skip: ['disk', 'network', 'system']
-      });
-
+      await updateSystemInfo({ auth, url, is_local, signal: controller.signal, refresh: !!systemInfo, previousSystemInfo: systemInfo, skip: ['disk', 'network'] });
     } else {
-
-      await updateSystemInfo({
-        auth,
-        url,
-        is_local,
-        signal: controller.signal,
-        refresh: !!systemInfo,
-        cachedSystemInfo: systemInfo
-      });
-
+      await updateSystemInfo({ auth, url, is_local, signal: controller.signal, refresh: !!systemInfo, previousSystemInfo: systemInfo });
     }
-
   }
 
   useEffect(() => {

src/components/instances/new/DetailsLocal.js

@@ -14,6 +14,7 @@ function DetailsLocal() {
   const navigate = useNavigate();
   const { customer_id } = useParams();
   const is_unpaid = useStoreState(appState, (s) => s.customer.is_unpaid);
+  const unlimited_local_install = useStoreState(appState, (s) => s.customer.unlimited_local_install);
   const [newInstance, setNewInstance] = useNewInstance({});
   const unusedCompute = useStoreState(
     appState,
@@ -26,7 +27,7 @@ function DetailsLocal() {
   const [formState, setFormState] = useState({});
   const [formData, setFormData] = useState({ ...products[0]?.value, ...newInstance });
   const isFree = !formData.compute_price || !!formData.compute_subscription_id;
-  const needsCard = products && !hasCard && !isFree && !is_unpaid;
+  const needsCard = products && !hasCard && !isFree && !is_unpaid && !unlimited_local_install;
 
   useAsyncEffect(() => {
     const { submitted } = formState;

src/functions/api/instance/updateSystemInfo.js

@@ -120,9 +120,7 @@ export default async ({ auth, url, signal, refresh, is_local, cachedSystemInfo,
     result.network.latency.ms;
   const networkLatencyStatus = skip.includes('network') ?
     parseFloat(cachedSystemInfo.networkLatencyStatus) :
-    networkLatency > 1000 ?
-      'danger' : networkLatency > 500 ?
-        'warning' : 'success';
+    networkLatency > 1000 ? 'danger' : networkLatency > 500 ? 'warning' : 'success';
 
   const systemInfo = {
     totalMemory: totalMemory?.toFixed(2),