Remove isDemo & isManaged

Author: JWittmeyer

src/components/models-download/ModelsDownload.tsx

@@ -1,14 +1,14 @@
 import { selectModelsDownloaded, setModelsDownloaded } from "@/src/reduxStore/states/pages/models-downloaded";
 import { ModelsDownloaded, ModelsDownloadedStatus } from "@/src/types/components/models-downloaded/models-downloaded";
 import { Tooltip } from "@nextui-org/react";
-import { IconAlertTriangleFilled, IconArrowLeft, IconBan, IconCheckbox, IconCircleCheckFilled, IconExternalLink, IconLoader, IconPlus, IconTrash } from "@tabler/icons-react";
+import { IconAlertTriangleFilled, IconArrowLeft, IconCircleCheckFilled, IconExternalLink, IconLoader, IconPlus, IconTrash } from "@tabler/icons-react";
 import { useRouter } from "next/router";
 import { useCallback, useEffect } from "react";
 import { useDispatch, useSelector } from "react-redux";
 import LoadingIcon from "../shared/loading/LoadingIcon";
 import { openModal, setModalStates } from "@/src/reduxStore/states/modal";
 import { ModalEnum } from "@/src/types/shared/modal";
-import { selectIsAdmin, selectIsManaged, selectOrganizationId } from "@/src/reduxStore/states/general";
+import { selectIsAdmin, selectOrganizationId } from "@/src/reduxStore/states/general";
 import { timer } from "rxjs";
 import { TOOLTIPS_DICT } from "@/src/util/tooltip-constants";
 import AddModelDownloadModal from "./AddModelDownloadModal";
@@ -20,8 +20,6 @@ import { Application, CurrentPage } from "@/submodules/react-components/hooks/we
 export default function ModelsDownload() {
     const router = useRouter();
     const dispatch = useDispatch();
-
-    const isManaged = useSelector(selectIsManaged);
     const isAdmin = useSelector(selectIsAdmin);
     const modelsDownloaded = useSelector(selectModelsDownloaded);
 
@@ -139,7 +137,6 @@ export default function ModelsDownload() {
         <div className="grid grid-cols-1 lg:grid-cols-2 gap-2 mt-1 align-top">
             <div>
                 <button onClick={() => dispatch(openModal(ModalEnum.ADD_MODEL_DOWNLOAD))}
-                    disabled={!isManaged}
                     className={`mr-1 inline-flex items-center px-2.5 py-2 border border-gray-300 shadow-sm text-xs font-semibold rounded-md text-gray-700 bg-white hover:bg-gray-50 focus:outline-none cursor-pointer disabled:cursor-not-allowed disabled:opacity-50`}>
                     <IconPlus className="h-4 w-4 mr-1" />
                     Add new model

src/components/projects/ProjectCard.tsx

@@ -1,4 +1,4 @@
-import { selectIsAdmin, selectIsDemo, selectUser } from "@/src/reduxStore/states/general";
+import { selectIsAdmin, selectUser } from "@/src/reduxStore/states/general";
 import { closeModal, setModalStates } from "@/src/reduxStore/states/modal";
 import { removeFromAllProjectsById } from "@/src/reduxStore/states/project";
 import { Project, ProjectCardProps, ProjectStatus } from "@/src/types/components/projects/projects-list";
@@ -16,7 +16,6 @@ export default function ProjectCard(props: ProjectCardProps) {
     const router = useRouter();
     const dispatch = useDispatch();
 
-    const isDemo = useSelector(selectIsDemo);
     const isAdmin = useSelector(selectIsAdmin);
     const user = useSelector(selectUser);
 
@@ -56,7 +55,7 @@ export default function ProjectCard(props: ProjectCardProps) {
                         <Tooltip content={props.project.user.firstName && props.project.user.lastName ? props.project.user.mail : ''} placement="bottom" color="invert" className="cursor-auto">
                             <span className="text-sm text-gray-900">{props.project.user.firstName && props.project.user.lastName ? props.project.user.firstName + ' ' + props.project.user.lastName : UNKNOWN_USER}</span>
                         </Tooltip>
-                        {!isDemo && isAdmin && <>
+                        {isAdmin && <>
                             <span className="text-sm text-gray-500">on</span>
                             <span className="text-sm text-gray-900 ">{props.project.date}</span>
                             <span className="text-sm text-gray-500">at</span>

src/components/projects/ProjectsList.tsx

@@ -1,4 +1,4 @@
-import { selectInactiveOrganization, selectIsDemo, selectIsManaged, selectOrganizationId, selectUser, setComments } from "@/src/reduxStore/states/general"
+import { selectInactiveOrganization, selectOrganizationId, selectUser, setComments } from "@/src/reduxStore/states/general"
 import { selectAllProjects, setAllProjects } from "@/src/reduxStore/states/project";
 import { Project, ProjectStatistics } from "@/src/types/components/projects/projects-list";
 import { percentRoundString } from "@/submodules/javascript-functions/general";
@@ -15,20 +15,17 @@ import { setDataSlices, setFullSearchStore, setSearchGroupsStore } from "@/src/r
 import { SearchGroup } from "@/submodules/javascript-functions/enums/enums";
 import { useWebsocket } from "@/submodules/react-components/hooks/web-socket/useWebsocket";
 import { getAllProjects } from "@/src/services/base/project";
-import { addUserToOrganization, createOrganization, getCanCreateLocalOrg, getOverviewStats } from "@/src/services/base/organization";
+import { getOverviewStats } from "@/src/services/base/organization";
 import { Application, CurrentPage } from "@/submodules/react-components/hooks/web-socket/constants";
 
 export default function ProjectsList() {
     const dispatch = useDispatch();
 
     const organizationInactive = useSelector(selectInactiveOrganization);
-    const isManaged = useSelector(selectIsManaged);
-    const isDemo = useSelector(selectIsDemo);
     const projects = useSelector(selectAllProjects);
     const user = useSelector(selectUser);
 
     const [projectStatisticsById, setProjectStatisticsById] = useState({});
-    const [canCreateOrg, setCanCreateOrg] = useState(false);
     const [dataLoaded, setDataLoaded] = useState(false);
 
     useEffect(() => {
@@ -47,8 +44,6 @@ export default function ProjectsList() {
         if (!organizationInactive) {
             refetchProjectsAndPostProcess();
             refetchStatsAndPostProcess();
-        } else {
-            createDefaultOrg();
         }
     }, [organizationInactive, user]);
 
@@ -75,25 +70,6 @@ export default function ProjectsList() {
         });
     }
 
-    function createDefaultOrg() {
-        if (isManaged || isDemo) {
-            setDataLoaded(true);
-            return;
-        }
-        getCanCreateLocalOrg(res => {
-            const canCreate = res.data["canCreateLocalOrg"]
-            setCanCreateOrg(canCreate);
-            if (!canCreate) return;
-            const localhostOrg = "localhost";
-            createOrganization(localhostOrg, () => {
-                addUserToOrganization(user.mail, localhostOrg, () => {
-                    location.reload();
-                    setDataLoaded(true);
-                });
-            })
-        });
-    }
-
     const handleWebsocketNotification = useCallback((msgParts: string[]) => {
         if (['project_created', 'project_deleted', 'project_update'].includes(msgParts[1])) {
             refetchProjectsAndPostProcess();
@@ -126,7 +102,7 @@ export default function ProjectsList() {
                             <main className="mt-16 mx-auto px-4 sm:mt-24 sm:px-6 lg:mt-32">
                                 <div className="lg:grid lg:grid-cols-12 lg:gap-8">
                                     <div className="sm:text-center md:mx-auto lg:col-span-6 lg:text-left">
-                                        {isManaged ? (<div>
+                                        <div>
                                             <div className="text-gray-500 font-semibold text-base uppercase">You&apos;re now on the waitlist!
                                             </div>
                                             <div className="font-extrabold text-gray-900 text-5xl mt-1">
@@ -138,30 +114,12 @@ export default function ProjectsList() {
                                                     className="underline cursor-pointer">here</span></a>.
                                             </div>
                                             <div className="text-gray-500 mt-5">
-                                                In the meantime, feel free to take a look at a product demo or check out our&nbsp;
+                                                In the meantime, feel free to take a look at our&nbsp;
                                                 <a href="https://docs.kern.ai/" target="_blank"><span
                                                     className="underline cursor-pointer">documentation</span></a>. If you have any
                                                 questions, contact us any time.
                                             </div>
-                                        </div>) : (
-                                            <div>
-                                                {canCreateOrg ? (<div className="text-gray-500 font-semibold text-base uppercase">
-                                                    Preparing your account. Please reload the page.
-                                                </div>) : (<div className="text-gray-500 font-semibold text-base uppercase">
-                                                    Maximum number of users reached. Please look into our managed version.</div>)}
-
-                                                <div className="font-normal text-xl text-gray-500 mt-5">
-                                                    {canCreateOrg ? (<span>
-                                                        In the meantime, feel free to take a look at a product demo or check out our
-                                                        <a href="https://docs.kern.ai/" target="_blank"><span
-                                                            className="underline cursor-pointer">documentation</span></a>. If you have
-                                                        any
-                                                        questions, you can reach out to us.
-                                                    </span>) : (<span> If you are interested in working with multiple users take a look at our <a
-                                                        href="./users"><span className="underline cursor-pointer">options</span></a></span>)}
-                                                </div>
-                                            </div>
-                                        )}
+                                        </div>
                                     </div>
                                     <YoutubeIntroduction />
                                 </div>

src/components/projects/projectId/data-browser/modals/DataSliceInfoModal.tsx

@@ -1,5 +1,4 @@
 import Modal from "@/src/components/shared/modal/Modal";
-import { selectIsManaged } from "@/src/reduxStore/states/general";
 import { closeModal, selectModal } from "@/src/reduxStore/states/modal";
 import { setDisplayUserRole } from "@/src/reduxStore/states/pages/labeling";
 import { ModalEnum } from "@/src/types/shared/modal";
@@ -16,7 +15,6 @@ export default function DataSliceInfoModal() {
     const router = useRouter();
     const dispatch = useDispatch();
 
-    const isManaged = useSelector(selectIsManaged);
     const modalSliceInfo = useSelector(selectModal(ModalEnum.DATA_SLICE_INFO));
 
     function testLink(link) {
@@ -39,12 +37,10 @@ export default function DataSliceInfoModal() {
                                 {value.substring(value.startsWith("https") ? 8 : 7)}</span>
                         </Tooltip>
                     </div>
-                    <Tooltip content={TOOLTIPS_DICT.DATA_BROWSER.ONLY_MANAGED} color="invert" placement="right" className="mt-3">
-                        <button onClick={() => testLink(value + '?pos=1&type=DATA_SLICE')} disabled={!isManaged}
-                            className="opacity-100 w-40 bg-indigo-700 text-white text-xs leading-4 font-semibold px-4 py-2 rounded-md cursor-pointer hover:bg-indigo-800 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 disabled:opacity-50 disabled:cursor-not-allowed">
-                            View as expert
-                        </button>
-                    </Tooltip>
+                    <button onClick={() => testLink(value + '?pos=1&type=DATA_SLICE')}
+                        className="opacity-100 w-40 bg-indigo-700 text-white text-xs leading-4 font-semibold px-4 py-2 rounded-md cursor-pointer hover:bg-indigo-800 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 disabled:opacity-50 disabled:cursor-not-allowed">
+                        View as expert
+                    </button>
                 </div>) : (<div className="flex flex-grow justify-between gap-8 text-sm">
                     <p>{key}</p>
                     <p>{value}</p>

src/components/projects/projectId/heuristics/HeuristicsHeader.tsx

@@ -1,5 +1,5 @@
 import { Loading } from "@nextui-org/react";
-import { selectIsManaged, selectOrganizationId } from '@/src/reduxStore/states/general';
+import { selectOrganizationId } from '@/src/reduxStore/states/general';
 import { openModal, selectModal } from '@/src/reduxStore/states/modal';
 import { selectHeuristicsAll, setHeuristicType } from '@/src/reduxStore/states/pages/heuristics';
 import { selectLabelingTasksAll } from '@/src/reduxStore/states/pages/settings';
@@ -30,7 +30,6 @@ export default function HeuristicsHeader(props: HeuristicsHeaderProps) {
     const dispatch = useDispatch();
     const router = useRouter();
 
-    const isManaged = useSelector(selectIsManaged);
     const projectId = useSelector(selectProjectId);
     const heuristics = useSelector(selectHeuristicsAll);
     const labelingTasks = useSelector(selectLabelingTasksAll);

src/components/projects/projectId/settings/embeddings/Embeddings.tsx

@@ -1,6 +1,6 @@
 import LoadingIcon from "@/src/components/shared/loading/LoadingIcon";
-import { selectIsManaged, selectOrganizationId } from "@/src/reduxStore/states/general";
-import { closeModal, openModal, setModalStates } from "@/src/reduxStore/states/modal";
+import { selectOrganizationId } from "@/src/reduxStore/states/general";
+import { openModal, setModalStates } from "@/src/reduxStore/states/modal";
 import { selectAttributes, selectEmbeddings } from "@/src/reduxStore/states/pages/settings";
 import { selectProjectId } from "@/src/reduxStore/states/project";
 import { Embedding, EmbeddingState, EmbeddingType } from "@/src/types/components/projects/projectId/settings/embeddings";
@@ -24,7 +24,6 @@ export default function Embeddings(props: { refetchEmbeddings: () => void }) {
     const router = useRouter();
 
     const attributes = useSelector(selectAttributes);
-    const isManaged = useSelector(selectIsManaged);
     const embeddings = useSelector(selectEmbeddings);
     const projectId = useSelector(selectProjectId);
 
@@ -176,8 +175,8 @@ export default function Embeddings(props: { refetchEmbeddings: () => void }) {
                         Generate embedding
                     </button>
                 </Tooltip>
-                <Tooltip content={!isManaged ? TOOLTIPS_DICT.PROJECT_SETTINGS.EMBEDDINGS.HOSTED_VERSION : TOOLTIPS_DICT.PROJECT_SETTINGS.EMBEDDINGS.NAVIGATE_MODELS_DOWNLOADED} color="invert" placement="right">
-                    <button disabled={!isManaged} onClick={() => router.push('/models-download')}
+                <Tooltip content={TOOLTIPS_DICT.PROJECT_SETTINGS.EMBEDDINGS.NAVIGATE_MODELS_DOWNLOADED} color="invert" placement="right">
+                    <button onClick={() => router.push('/models-download')}
                         className={`"ml-1 inline-block items-center px-2.5 py-1.5 border border-gray-300 shadow-sm text-xs font-semibold rounded-md text-gray-700 bg-white hover:bg-gray-50 focus:outline-none cursor-pointer disabled:cursor-not-allowed disabled:opacity-50`}>
                         <IconArrowAutofitDown className="h-5 w-5 inline-block mr-1" />
                         See downloaded models

src/components/shared/header/Header.tsx

@@ -1,4 +1,4 @@
-import { selectCurrentPage, selectDisplayIconComments, selectIsDemo, selectIsManaged, selectOrganization, selectUser, setNotifications } from "@/src/reduxStore/states/general";
+import { selectCurrentPage, selectDisplayIconComments, selectOrganization, selectUser, setNotifications } from "@/src/reduxStore/states/general";
 import { UserRole } from "@/src/types/shared/sidebar";
 import { Tooltip } from "@nextui-org/react";
 import { useEffect, useState } from "react";
@@ -24,8 +24,6 @@ export default function Header() {
     const router = useRouter();
     const dispatch = useDispatch();
 
-    const isDemo = useSelector(selectIsDemo);
-    const isManaged = useSelector(selectIsManaged);
     const currentPage = useSelector(selectCurrentPage);
     const organization = useSelector(selectOrganization);
     const user = useSelector(selectUser);
@@ -72,16 +70,10 @@ export default function Header() {
     return (
         <header className="sticky top-0 z-50 w-full">
             <div className="relative z-10 flex-shrink-0 h-16 bg-white border-b border-gray-200 shadow-sm flex justify-between items-center">
-                {isDemo ? (<div className="absolute top-0 left-0 right-0 bottom-0 flex items-center justify-center pointer-events-none">
-                    <span className="inline-flex items-center px-2 py-0.5 rounded font-medium bg-red-100 text-red-800">
-                        <IconPlayCard className="w-6 h-6 mr-2" />
-                        Demo Playground - Everything will be reset on the hour
-                    </span>
-                </div>) : (<></>)}
                 <div className="flex items-center">
                     {currentPage == CurrentPage.PROJECTS || currentPage == CurrentPage.USERS ? (<div className="ml-4 text-gray-500 text-sm font-normal">
                         {!organizationInactive && <> Welcome, <span className="font-semibold text-gray-900">{user?.firstName}</span>! See your projects at <span className="font-semibold text-gray-900">{organization?.name}</span>.</>}
-                        {organizationInactive && <> Welcome, <span className="font-semibold text-gray-900">{user?.firstName}</span>! {!isManaged ? 'Switch to your main account to continue labeling...' : 'You are currently on the waitlist.'}
+                        {organizationInactive && <> Welcome, <span className="font-semibold text-gray-900">{user?.firstName}</span>! You are currently on the waitlist.
                         </>}
                     </div>) : (<></>)}
                     {currentPage == CurrentPage.NEW_PROJECT && <div className="ml-4 text-gray-500 text-sm font-normal">
@@ -96,7 +88,7 @@ export default function Header() {
                     {currentPage == CurrentPage.CONFIG && <div className="ml-4 text-gray-500 text-sm font-normal">
                         {!organizationInactive && user && <>Welcome, <span className="font-semibold text-gray-900">{user?.firstName}</span>! Change your app configuration <span className="font-semibold text-gray-900">here</span>.</>}
                         {organizationInactive && <>Welcome, <span className="font-semibold text-gray-900">{user?.firstName}</span>!
-                            {!isManaged ? 'Switch to your main account to continue labeling...' : 'You are currently on the waitlist.'}</>}
+                            You are currently on the waitlist.</>}
                     </div>}
                 </div>
                 <div className="flex flex-row flex-nowrap items-center">
@@ -107,7 +99,7 @@ export default function Header() {
                             </Tooltip>
                         </a>
                     </div>
-                    {(user?.role == UserRole.ENGINEER && isManaged) ? (
+                    {(user?.role == UserRole.ENGINEER) ? (
                         <div className="flex items-center justify-center">
                             <a href="/refinery/users" onClick={(e: any) => { e.preventDefault(); dispatch(setProjectIdSampleProject(null)); router.push(`/users`) }}
                                 className="flex mr-6">