Revert "Merge remote-tracking branch 'origin/develop' into fb-optic-1748/ui-improvements"

This reverts commit 291f6e3, reversing
changes made to 1c53cd9.

Author: yyassi-heartex

Dockerfile.development

@@ -33,9 +33,6 @@ docker-run-dev:
 docker-migrate-dev:
 	docker compose run app python3 /label-studio/label_studio/manage.py migrate
 
-docker-collectstatic-dev:
-	docker compose run app python3 /label-studio/label_studio/manage.py collectstatic
-
 # Install modules
 frontend-install:
 	cd web && yarn install --frozen-lockfile;

Makefile

@@ -13,7 +13,7 @@
 import pandas as pd
 import requests
 from core import utils
-from core.feature_flags import all_flags, flag_set, get_feature_file_path
+from core.feature_flags import all_flags, get_feature_file_path
 from core.label_config import generate_time_series_json
 from core.utils.common import collect_versions
 from core.utils.io import find_file
@@ -27,7 +27,7 @@
     HttpResponseServerError,
     JsonResponse,
 )
-from django.shortcuts import redirect, render, reverse
+from django.shortcuts import redirect, reverse
 from django.template import loader
 from django.utils._os import safe_join
 from django.views.decorators.csrf import csrf_exempt
@@ -55,11 +55,7 @@ def main(request):
             return redirect(reverse('user-login'))
 
         # business mode access
-        if flag_set('fflag_all_feat_dia_1777_ls_homepage_short', user):
-            print('redirect to home page')
-            return render(request, 'home/home.html')
-        else:
-            return redirect(reverse('projects:project-index'))
+        return redirect(reverse('projects:project-index'))
 
     # not authenticated
     return redirect(reverse('user-login'))

label_studio/core/templates/home/home.html

@@ -173,7 +173,7 @@
       <div class="field field--wide">
         <label for="example_fetch">Example fetch projects data:</label>
         <textarea id="example_fetch" class="example_code ls-textarea" type="text" readonly
-                  style="height: 92px; font-size: 14px; padding: 9px 16px">
+                  style="height: 92px; font-size: 14px">
           {% if settings.HOSTNAME %}
             curl -X GET {{ settings.HOSTNAME }}/api/projects/ -H 'Authorization: Token {{token}}'
           {% else %}

label_studio/core/views.py

@@ -45,10 +45,7 @@ def user_signup(request):
 
     # checks if the URL is a safe redirection.
     if not next_page or not url_has_allowed_host_and_scheme(url=next_page, allowed_hosts=request.get_host()):
-        if flag_set('fflag_all_feat_dia_1777_ls_homepage_short', user):
-            next_page = reverse('main')
-        else:
-            next_page = reverse('projects:project-index')
+        next_page = reverse('projects:project-index')
 
     user_form = forms.UserSignupForm()
     organization_form = OrganizationSignupForm()
@@ -108,10 +105,7 @@ def user_login(request):
 
     # checks if the URL is a safe redirection.
     if not next_page or not url_has_allowed_host_and_scheme(url=next_page, allowed_hosts=request.get_host()):
-        if flag_set('fflag_all_feat_dia_1777_ls_homepage_short', user):
-            next_page = reverse('main')
-        else:
-            next_page = reverse('projects:project-index')
+        next_page = reverse('projects:project-index')
 
     login_form = load_func(settings.USER_LOGIN_FORM)
     form = login_form()

label_studio/users/templates/users/user_account.html

@@ -6,7 +6,6 @@ tmp
 
 # dependencies
 node_modules
-dist
 
 # IDEs and editors
 /.idea

label_studio/users/views.py

@@ -1,12 +1,10 @@
 {
-  "extends": ["stylelint-config-tailwindcss/scss", "stylelint-config-standard-scss"],
+  "extends": "stylelint-config-standard-scss",
   "rules": {
     "selector-class-pattern": null,
     "custom-property-pattern": null,
     "no-descending-specificity": null,
-    "function-no-unknown": null,
     "scss/no-global-function-names": null,
-    "scss/function-no-unknown": null,
     "selector-pseudo-class-no-unknown": [
       true,
       {

web/.gitignore

@@ -12,27 +12,17 @@ import { MultiProvider } from "../providers/MultiProvider";
 import { ProjectProvider } from "../providers/ProjectProvider";
 import { RoutesProvider } from "../providers/RoutesProvider";
 import { DRAFT_GUARD_KEY, DraftGuard, draftGuardCallback } from "../components/DraftGuard/DraftGuard";
+import "./App.scss";
 import { AsyncPage } from "./AsyncPage/AsyncPage";
 import ErrorBoundary from "./ErrorBoundary";
+import { RootPage } from "./RootPage";
 import { FF_OPTIC_2, FF_UNSAVED_CHANGES, FF_PRODUCT_TOUR, isFF } from "../utils/feature-flags";
 import { TourProvider } from "@humansignal/core";
 import { ToastProvider, ToastViewport } from "@humansignal/ui";
-import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import { JotaiProvider, JotaiStore } from "../utils/jotai-store";
 import { CurrentUserProvider } from "../providers/CurrentUser";
-import { RootPage } from "./RootPage";
-import "@humansignal/ui/src/tailwind.css";
-import "./App.scss";
 
 const baseURL = new URL(APP_SETTINGS.hostname || location.origin);
 export const UNBLOCK_HISTORY_MESSAGE = "UNBLOCK_HISTORY";
-const queryClient = new QueryClient({
-  defaultOptions: {
-    queries: {
-      refetchOnWindowFocus: false,
-    },
-  },
-});
 
 const browserHistory = createBrowserHistory({
   basename: baseURL.pathname || "/",
@@ -67,8 +57,6 @@ const App = ({ content }) => {
       <Router history={browserHistory}>
         <MultiProvider
           providers={[
-            <JotaiProvider key="jotai" store={JotaiStore} />,
-            <QueryClientProvider key="query" client={queryClient} />,
             <AppStoreProvider key="app-store" />,
             <ApiProvider key="api" />,
             <ConfigProvider key="config" />,

web/.stylelintrc.json

@@ -22,7 +22,6 @@
   border: var(--button-border);
   cursor: pointer;
   outline: none;
-  flex-shrink: 0;
   display: inline-flex;
   text-align: center;
   transition: all 100ms ease;
@@ -361,4 +360,4 @@
   100% {
     background-position: 37px 0;
   }
-}
+}

web/apps/labelstudio/src/app/App.jsx

@@ -21,6 +21,4 @@
   opacity: 0.5;
   top: 1px;
   position: relative;
-  display: inline;
-  vertical-align: baseline;
-}
+}

web/apps/labelstudio/src/components/Button/Button.scss

@@ -5,7 +5,7 @@ import { clsx } from "clsx";
 /** @deprecated - needs to be replaced with @humansignal/ui Label - visualizes differently currently */
 const Label = ({ text, children, required, placement, description, size, large, style, simple, flat, className }) => {
   const rootClass = cn("label-ls");
-  const classList = [rootClass.toClassName()];
+  const classList = [rootClass];
   const tagName = simple ? "div" : "label";
   const mods = {
     size,

web/apps/labelstudio/src/components/DescriptionList/DescriptionList.scss

@@ -3,6 +3,7 @@ import { StaticContent } from "../../app/StaticContent/StaticContent";
 import {
   IconBook,
   IconFolder,
+  IconModel,
   IconPersonInCircle,
   IconPin,
   IconTerminal,
@@ -25,10 +26,9 @@ import { VersionNotifier, VersionProvider } from "../VersionNotifier/VersionNoti
 import "./Menubar.scss";
 import "./MenuContent.scss";
 import "./MenuSidebar.scss";
-import { FF_HOMEPAGE } from "../../utils/feature-flags";
-import { IconHome } from "@humansignal/ui";
-import { pages } from "@humansignal/core";
-import { isFF } from "../../utils/feature-flags";
+import { ModelsPage } from "../../pages/Organization/Models/ModelsPage";
+import { FF_DIA_835, isFF } from "../../utils/feature-flags";
+import { AccountSettingsPage } from "@humansignal/core";
 
 export const MenubarContext = createContext();
 
@@ -135,7 +135,7 @@ export const Menubar = ({ enabled, defaultOpened, defaultPinned, children, onSid
         <div className={menubarClass}>
           <Dropdown.Trigger dropdown={menuDropdownRef} closeOnClickOutside={!sidebarPinned}>
             <div className={`${menubarClass.elem("trigger")} main-menu-trigger`}>
-              <img src={absoluteURL("/static/icons/logo.svg")} alt="Label Studio Logo" style={{ height: 22 }} />
+              <img src={absoluteURL("/static/icons/logo.svg")} alt="Label Studio Logo" height="22" />
               <Hamburger opened={sidebarOpened} />
             </div>
           </Dropdown.Trigger>
@@ -151,13 +151,13 @@ export const Menubar = ({ enabled, defaultOpened, defaultPinned, children, onSid
             align="right"
             content={
               <Menu>
-                <Menu.Item icon={<LsSettings />} label="Account &amp; Settings" href={pages.AccountSettingsPage.path} />
+                <Menu.Item icon={<LsSettings />} label="Account &amp; Settings" href={AccountSettingsPage.path} />
                 {/* <Menu.Item label="Dark Mode"/> */}
                 <Menu.Item icon={<LsDoor />} label="Log Out" href={absoluteURL("/logout")} data-external />
                 {showNewsletterDot && (
                   <>
                     <Menu.Divider />
-                    <Menu.Item className={cn("newsletter-menu-item")} href={pages.AccountSettingsPage.path}>
+                    <Menu.Item className={cn("newsletter-menu-item")} href={AccountSettingsPage.path}>
                       <span>Please check new notification settings in the Account & Settings page</span>
                       <span className={cn("newsletter-menu-badge")} />
                     </Menu.Item>
@@ -186,9 +186,9 @@ export const Menubar = ({ enabled, defaultOpened, defaultPinned, children, onSid
               style={{ width: 240 }}
             >
               <Menu>
-                {isFF(FF_HOMEPAGE) && <Menu.Item label="Home" to="/" icon={<IconHome />} data-external exact />}
                 <Menu.Item label="Projects" to="/projects" icon={<IconFolder />} data-external exact />
                 <Menu.Item label="Organization" to="/organization" icon={<IconPersonInCircle />} data-external exact />
+                {isFF(FF_DIA_835) && <Menu.Item label="Models" to={ModelsPage.path} icon={<IconModel />} exact />}
 
                 <Menu.Spacer />
 

web/apps/labelstudio/src/components/Form/Elements/Label/Label.jsx

@@ -13,10 +13,6 @@ const ModalContext = createContext();
 export class Modal extends React.Component {
   modalRef = React.createRef();
 
-  get visible() {
-    return this.state.visible;
-  }
-
   constructor(props) {
     super(props);
 
@@ -208,8 +204,8 @@ Modal.Header = ({ children, divided }) => (
   </Elem>
 );
 
-Modal.Footer = ({ children, bare, style, className }) => (
-  <Elem name="footer" mod={{ bare }} mix={className} style={style}>
+Modal.Footer = ({ children, bare }) => (
+  <Elem name="footer" mod={{ bare }}>
     {children}
   </Elem>
 );