Merge branch 'main' of https://github.com/Protofy-xyz/Protofy

Protofy-xyz · Jul 5, 2024 · b1dba32 · b1dba32
2 parents f68cc51 + e04e1c5
commit b1dba32
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/packages/protolib/components/ObjectForm.tsx b/packages/protolib/components/ObjectForm.tsx
@@ -1,6 +1,7 @@
 import React from "react"
 import { EditableObject } from './EditableObject';
-import { API, getPendingResult } from '../base';
+import { API } from '../base';
+import { getPendingResult } from 'protolib/base/PendingResult';
 import { useToastController, Text, YStack } from '@my/ui';
 import { z } from "protolib/base";
 

diff --git a/packages/protolib/lib/Auth.ts b/packages/protolib/lib/Auth.ts
@@ -1,6 +1,6 @@
 import { API } from "../base/Api"
 import { RegisterSchema } from 'app/schema';
-import {getPendingResult} from 'protolib';
+import { getPendingResult } from 'protolib/base/PendingResult';
 import { z } from "protolib/base";
 
 export const Auth = {

diff --git a/packages/protolib/lib/createApiAtom.ts b/packages/protolib/lib/createApiAtom.ts
@@ -1,4 +1,4 @@
 import { atom } from "jotai";
-import { PendingResult, getPendingResult } from "../base";
+import { PendingResult, getPendingResult } from "../base/PendingResult";
 
 export const createApiAtom = (initialState) => atom<PendingResult>(getPendingResult("pending", initialState))
diff --git a/packages/protolib/lib/useRedirectToEnviron.ts b/packages/protolib/lib/useRedirectToEnviron.ts
@@ -1,4 +1,4 @@
-import { AppConfContext, SiteConfigType } from 'protolib';
+import { AppConfContext } from 'protolib/providers/AppConf';
 import { getWorkspaceEnv } from './useWorkspaceEnv';
 import { useContext, useEffect } from 'react';
 import { useRouter, usePathname } from 'solito/navigation';

diff --git a/packages/protolib/lib/useRemoteState.tsx b/packages/protolib/lib/useRemoteState.tsx
@@ -1,5 +1,6 @@
 import { useEffect, useRef, useState } from 'react';
-import { API, usePendingEffect, useSubscription } from 'protolib';
+import { usePendingEffect } from 'protolib/lib/usePendingEffect';
+import useSubscription from 'protolib/lib/mqtt/useSubscription'; 
 import { PendingResult } from '../base';
 
 export const useRemoteStateList = (items, fetch, topic, model, quickRefresh=false) => { // Quick refresh skips fetch when a change is detected

diff --git a/packages/visualui/src/components/RenderNode.tsx b/packages/visualui/src/components/RenderNode.tsx
@@ -309,7 +309,6 @@ export const RenderNode = ({ render, onEnableEvents, metadata }) => {
                                         : null
                                 }
                                 {
-                                    custom.options || deletable ?
                                         <UIMenu
                                             onOpenChange={onEnableEvents}
                                             trigger={
@@ -353,7 +352,6 @@ export const RenderNode = ({ render, onEnableEvents, metadata }) => {
                                                 </>
                                             }
                                         />
-                                        : null
                                 }
                             </div>
                         </div >,