Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: LEAP-930: Changes to ML settings UI #5712

Merged
merged 11 commits into from
Apr 18, 2024
Merged

fix: LEAP-930: Changes to ML settings UI #5712

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7e307a0
changing the copy back and providing more info
Apr 9, 2024
d87528e
changing the copy
Apr 9, 2024
54faef5
fixing structure
Apr 9, 2024
c427a7a
ci: Build frontend
robot-ci-heartex Apr 9, 2024
bc87eb8
Update web/apps/labelstudio/src/components/Description/Description.styl
deppp Apr 9, 2024
6e7c654
ci: Build frontend
robot-ci-heartex Apr 9, 2024
402f7e3
Fix branch name
hlomzik Apr 10, 2024
026b594
Improve style and mock-ups
hlomzik Apr 10, 2024
8afa932
Simplify callout block in Model settings
hlomzik Apr 10, 2024
b7c11f0
Merge branch 'develop' into 'fb-leap-930/copy-changes'
hlomzik Apr 18, 2024
f76146f
ci: Build frontend
robot-ci-heartex Apr 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Improve style and mock-ups
  • Loading branch information
@hlomzik
hlomzik committed Apr 10, 2024
commit 026b594fe9dc0e8e69bc89abd042c18efec34b17
7 changes: 0 additions & 7 deletions web/apps/labelstudio/src/components/Description/Description.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,3 @@

&_large
margin 40px 0

&_alert
&_warning
background-color rgb(255, 251, 230);
border 1px solid rgb(255, 229, 143);
border-radius 8px
padding 10px
18 changes: 16 additions & 2 deletions web/apps/labelstudio/src/pages/Settings/MachineLearningSettings/MachineLearningList.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,23 @@
.ml-settings
.form
margin-top: 32px

.description
line-height: 1.5

&__callout
color: #9e9e9e;
background-color rgb(255, 251, 230);
border 1px solid rgb(255, 229, 143);
border-radius 8px;
padding 10px;
line-height: 1.5;
display: flex;
gap: 5px;

.backend-card
width 100%
padding 15px
border-radius 5px
marginTop 0
background #FAFAFA
border 1px solid rgba(137, 128, 152, 0.16)

Expand Down
22 changes: 12 additions & 10 deletions web/apps/labelstudio/src/pages/Settings/MachineLearningSettings/MachineLearningSettings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useCallback, useContext, useEffect, useState } from 'react';
import { NavLink } from 'react-router-dom';
import { Button, Spinner } from '../../../components';
import { Description } from '../../../components/Description/Description';
import { Divider } from '../../../components/Divider/Divider';
import { Form, Label, Toggle } from '../../../components/Form';
import { modal } from '../../../components/Modal/Modal';
import { EmptyState } from '../../../components/EmptyState/EmptyState';
Expand Down Expand Up @@ -132,24 +132,26 @@ export const MachineLearningSettings = () => {
backends={backends}
/>

<Divider height={32} />

{backends.length > 0 && (
<>
<Description style={{ marginTop: 0, maxWidth: 680, lineHeight: "1.5em" }}>
<Description>
A connected model has been detected! If you wish to fetch
predictions from this model, please follow these steps:
<br />
<br />
1. Navigate to the <i>Data Manager</i>.<br />
2. Select the desired tasks.<br />
3. Click on <i>Retrieve predictions</i> from the{' '}
<i>Actions</i> menu.
</Description>
<Description style={{ marginTop: 0, display: "flex", gap: "5px" }} className="description_alert_warning">
<IconInfo width="20" height="20" />
If you want to use the model predictions for prelabeling, please configure this in the Annotation settings.
3. Click on <i>Retrieve predictions</i> from the <i>Actions</i> menu.
</Description>
<Elem name="callout">
<IconInfo width="24" height="24" />
<span>
If you want to use the model predictions for prelabeling, please configure this in the
{" "}
<NavLink to="annotation">Annotation settings</NavLink>
.
</span>
</Elem>
</>
)}

Expand Down