Merge branch 'fix-private-select' into 'master'

Assistant: Priveleged until check added

See merge request postgres-ai/database-lab!936

Author: bogdan-ts

ui/packages/platform/src/components/BotSettingsForm/BotSettingsForm.tsx

@@ -126,18 +126,8 @@ const BotSettingsForm: React.FC<BotSettingsFormProps> = (props) => {
 
   const classes = useStyles()
 
-  const [threadVisibility, setThreadVisibility] = useState('private')
   const [data, setData] = useState<BotSettingState['data'] | null>(null)
 
-  const isSubscriber = useMemo(() => {
-    const hasEEPlan = orgData?.data?.plan === 'EE';
-    const hasSEPlan = data?.dbLabInstances?.data
-      ? Object.values(data.dbLabInstances.data).some((item) => item.plan === "SE")
-      : false;
-
-    return hasEEPlan || hasSEPlan;
-  }, [data?.dbLabInstances?.data, orgData?.data?.plan]);
-
 
   useEffect(() => {
     const unsubscribe = Store.listen(function () {
@@ -146,8 +136,6 @@ const BotSettingsForm: React.FC<BotSettingsFormProps> = (props) => {
       if (JSON.stringify(newStoreData) !== JSON.stringify(data)) {
         const auth = newStoreData?.auth || null;
         const orgProfile = newStoreData?.orgProfile || null;
-        const dbLabInstances = newStoreData?.dbLabInstances || null;
-        const projectId = props.match?.params?.projectId || null;
 
         if (
           auth?.token &&
@@ -158,14 +146,6 @@ const BotSettingsForm: React.FC<BotSettingsFormProps> = (props) => {
           Actions.getOrgs(auth.token, orgId);
         }
 
-        if (
-          auth?.token &&
-          !dbLabInstances?.isProcessing &&
-          !dbLabInstances?.error
-        ) {
-          Actions.getDbLabInstances(auth.token, orgId, projectId);
-        }
-
         setData(newStoreData);
       }
     });
@@ -269,13 +249,13 @@ const BotSettingsForm: React.FC<BotSettingsFormProps> = (props) => {
                       label={<><b>Public:</b> anyone can view chats, but only team members can respond</>}
                     />
                     <FormControlLabel
-                      disabled={!isSubscriber}
+                      disabled={!orgData?.chats_private_allowed}
                       className={classes.formControlLabel}
                       value="private"
                       control={<Radio size="small"/>}
                       label={<><b>Private:</b> chats are visible only to members of your organization</>}
                     />
-                    {!isSubscriber && <Typography variant="body2" className={classes.unlockNote}>
+                    {!orgData?.chats_private_allowed && <Typography variant="body2" className={classes.unlockNote}>
                       Unlock private conversations by either:
                       <ol>
                         <li>

ui/packages/platform/src/components/BotSettingsForm/BotSettingsFormWrapper.tsx

@@ -10,6 +10,8 @@ export interface BotSettingsFormProps {
     settingsOrganizationUpdate?: boolean
   }
   orgData?: {
+    priveleged_until: Date
+    chats_private_allowed: boolean
     data?: {
       plan?: string
     } | null

ui/packages/platform/src/components/types/index.ts

@@ -39,6 +39,7 @@ export interface Orgs {
     id: number
     owner_user_id: number
     is_chat_public_by_default: boolean
+    chats_private_allowed: boolean
     data: {
       plan: string
     } | null

ui/packages/platform/src/pages/Bot/BotWrapper.tsx

@@ -13,6 +13,8 @@ export interface BotWrapperProps {
   orgData: {
     id: number,
     is_chat_public_by_default: boolean
+    priveleged_until: Date
+    chats_private_allowed: boolean
     data: {
       plan: string
     } | null

ui/packages/platform/src/pages/Bot/index.tsx

@@ -129,7 +129,6 @@ export const BotPage = (props: BotPageProps) => {
   const [isChatsListVisible, setChatsListVisible] = useState(window?.innerWidth > 640);
   const [isSettingsDialogVisible, setSettingsDialogVisible] = useState(false);
   const [isDebugConsoleVisible, setDebugConsoleVisible] = useState(false);
-  const [refluxData, setRefluxData] = useState<RefluxState>(null)
 
   const history = useHistory();
 
@@ -177,42 +176,7 @@ export const BotPage = (props: BotPageProps) => {
     }
   }
 
-  const isSubscriber = useMemo(() => {
-    const hasEEPlan = orgData?.data?.plan === 'EE';
-    const hasSEPlan = refluxData?.dbLabInstances?.data
-      ? Object.values(refluxData.dbLabInstances.data).some((item) => item.plan === "SE")
-      : false;
-
-    return hasEEPlan || hasSEPlan;
-  }, [refluxData?.dbLabInstances?.data, orgData?.data?.plan]);
-
-  useEffect(() => {
-    const unsubscribe = Store.listen(function () {
-      const newStoreData = this.data;
-
-      if (JSON.stringify(newStoreData) !== JSON.stringify(refluxData)) {
-        const auth = newStoreData?.auth || null;
-        const dbLabInstances = newStoreData?.dbLabInstances || null;
-        const projectId = props.match?.params?.projectId || null;
-
-        if (
-          auth?.token &&
-          !dbLabInstances?.isProcessing &&
-          !dbLabInstances?.error
-        ) {
-          Actions.getDbLabInstances(auth.token, orgId, projectId);
-        }
-
-        setRefluxData(newStoreData);
-      }
-    });
-
-    Actions.refresh();
-
-    return () => {
-      unsubscribe();
-    };
-  }, [orgId, refluxData, props.match.params.projectId]);
+  const isSubscriber = useMemo(() => orgData?.chats_private_allowed, [orgData?.chats_private_allowed]);
 
   const publicChatMessage = useMemo(() => {
     if (isDemoOrg) {