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

Develop #1000

Merged
merged 8 commits into from
Apr 5, 2024
Merged

Develop #1000

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
03880b0
added some new columns to Queued task in Admin
Rahul-538 Apr 3, 2024
72b6f14
Merge branch 'develop' into Rahul-539
ishvindersethi22 Apr 4, 2024
c0b3957
Merge pull request #996 from AI4Bharat/Rahul-539
ishvindersethi22 Apr 4, 2024
ed5057a
sorted labels alphabetically
kartikvirendrar Apr 4, 2024
0c677c1
Merge pull request #997 from AI4Bharat/ocrsegcat8
ishvindersethi22 Apr 4, 2024
3ccd264
made color of figure label more evident
kartikvirendrar Apr 5, 2024
573cee8
Merge pull request #999 from AI4Bharat/ocrsegcat1
ishvindersethi22 Apr 5, 2024
d542c92
Merge branch 'master' into develop
ishvindersethi22 Apr 5, 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
95 changes: 45 additions & 50 deletions src/ui/pages/container/Admin/QueuedTasksDetails.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,16 @@ const QueuedTasksDetails = (props) => {
return {
uuid:el.uuid,
name:el.name,
received:el.received,
sent:el.sent|| "No",
started:el.started,
rejected:el.rejected|| "No",
succeeded:el.succeeded,
failed:el.failed || "No",
exception:el.exception || "No",
traceback:el.traceback|| "No",
worker:el.worker,
result:el.result,
state:el.state,
args:el.args,
args:el.kwargs,
Expand Down Expand Up @@ -91,56 +101,41 @@ const QueuedTasksDetails = (props) => {
});
};

const columns = [
{
name: "uuid",
label: "Id",
options: {
display: false,
filter: false,
sort: false,
align: "center",
},
},
{
name: "name",
label: "Name",
options: {
filter: false,
sort: false,
align: "center",
},
},
{
name: "state",
label: "State",
options: {
filter: false,
sort: false,
align: "center",
},
},
{
name: "args",
label: "Args",
options: {
filter: false,
sort: false,
align: "center",
setCellProps: () => ({ style: { paddingLeft: "30px" } }),
},
},
{
name: "kwargs",
label: "KwArgs",
options: {
filter: false,
sort: false,
align: "center",
setCellProps: () => ({ style: { paddingLeft: "30px" } }),
},
},
];
const defaultOptions = {
filter: false,
sort: false,
align: "center",
setCellProps: () => ({ style: { paddingLeft: "30px" } }),
};

function createColumn(name, label, options = {}) {
return {
name,
label,
options: {
...defaultOptions,
...options
}
};
}

const columns = [
createColumn("uuid", "Id", { display: true }),
createColumn("name", "Name"),
createColumn("state", "State"),
createColumn("args", "Args"),
createColumn("kwargs", "KwArgs"),
createColumn("received", "Received", { display: true }),
createColumn("sent", "Sent", { display: true }),
createColumn("started", "Started", { display: true }),
createColumn("rejected", "Rejected", { display: true }),
createColumn("succeeded", "Succeeded", { display: true }),
createColumn("failed", "Failed", { display: true }),
createColumn("exception", "Exception", { display: true }),
createColumn("traceback", "Traceback", { display: true }),
createColumn("worker", "Worker", { display: true }),
createColumn("result", "Result", { display: true }),
];

const options = {
textLabels: {
Expand Down
64 changes: 32 additions & 32 deletions src/ui/pages/container/Label-Studio/labelConfigJSX.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,48 +4,48 @@ export const labelConfigJS = `<View>
hotkey="shift+f" minlength="0"
placeholder="Filter Labels" />
<Labels name="annotation_labels" toName="image_url" className="ignore_assertion">
<Label value="paragraph" name="paragraph" background="#55EFC4" className="ignore_assertion"/>
<Label value="figure" name="figure" background="#FFEAA7" className="ignore_assertion"/>
<Label value="advertisement" name="advertisement" background="#1ABC9C" className="ignore_assertion"/>
<Label value="answer" name="answer" background="#2980B9" className="ignore_assertion"/>
<Label value="author" name="author" background="#2980B9" className="ignore_assertion"/>
<Label value="chapter-title" name="chapter-title" background="#F7C8E0" className="ignore_assertion"/>
<Label value="contact-info" name="contact-info" background="#D35400" className="ignore_assertion"/>
<Label value="dateline" name="dateline" background="#16A085" className="ignore_assertion"/>
<Label value="figure" name="figure" background="#8E44AD" className="ignore_assertion"/>
<Label value="figure-caption" name="figure-caption" background="#FDCB6E" className="ignore_assertion"/>
<Label value="table" name="table" background="#FAB1A0" className="ignore_assertion"/>
<Label value="table-caption" name="table-caption" background="#E17055" className="ignore_assertion"/>
<Label value="header" name="header" background="#8CC0DE" className="ignore_assertion"/>
<Label value="footer" name="footer" background="#81ECEC" className="ignore_assertion"/>
<Label value="first-level-question" name="first-level-question" background="#E74C3C" className="ignore_assertion"/>
<Label value="flag" name="flag" background="#34495E" className="ignore_assertion"/>
<Label value="folio" name="folio" background="#74B9FF" className="ignore_assertion"/>
<Label value="footer" name="footer" background="#81ECEC" className="ignore_assertion"/>
<Label value="footnote" name="footnote" background="#A29BFE" className="ignore_assertion"/>
<Label value="page-number" name="page-number" background="#A0BCC2" className="ignore_assertion"/>
<Label value="author" name="author" background="#2980B9" className="ignore_assertion"/>
<Label value="dateline" name="dateline" background="#16A085" className="ignore_assertion"/>
<Label value="formula" name="formula" background="#2ECC71" className="ignore_assertion"/>
<Label value="header" name="header" background="#8CC0DE" className="ignore_assertion"/>
<Label value="headline" name="headline" background="#D35400" className="ignore_assertion"/>
<Label value="index" name="index" background="#FFCCB3" className="ignore_assertion"/>
<Label value="jumpline" name="jumpline" background="#F39C12" className="ignore_assertion"/>
<Label value="options" name="options" background="#E8DFCA" className="ignore_assertion"/>
<Label value="ordered-list" name="ordered-list" background="#2C3E50" className="ignore_assertion"/>
<Label value="sub-ordered-list" name="sub-ordered-list" background="#E67E22" className="ignore_assertion"/>
<Label value="subsub-ordered-list" name="subsub-ordered-list" background="#AAD9BB" className="ignore_assertion"/>
<Label value="unordered-list" name="unordered-list" background="#8E44AD" className="ignore_assertion"/>
<Label value="sub-unordered-list" name="sub-unordered-list" background="#E0AED0" className="ignore_assertion"/>
<Label value="subsub-unordered-list" name="subsub-unordered-list" background="#AC87C5" className="ignore_assertion"/>
<Label value="page-number" name="page-number" background="#A0BCC2" className="ignore_assertion"/>
<Label value="paragraph" name="paragraph" background="#55EFC4" className="ignore_assertion"/>
<Label value="placeholder-text" name="placeholder-text" background="#3498DB" className="ignore_assertion"/>
<Label value="reference" name="reference" background="#27AE60" className="ignore_assertion"/>
<Label value="second-level-question" name="second-level-question" background="#9B59B6" className="ignore_assertion"/>
<Label value="section-title" name="section-title" background="#F39C12" className="ignore_assertion"/>
<Label value="sidebar" name="sidebar" background="#F1C40F" className="ignore_assertion"/>
<Label value="sub-headline" name="sub-headline" background="#8E44AD" className="ignore_assertion"/>
<Label value="sub-ordered-list" name="sub-ordered-list" background="#E67E22" className="ignore_assertion"/>
<Label value="sub-section-title" name="sub-section-title" background="#C0392B" className="ignore_assertion"/>
<Label value="subsub-ordered-list" name="subsub-ordered-list" background="#AAD9BB" className="ignore_assertion"/>
<Label value="subsub-section-title" name="subsub-section-title" background="#27AE60" className="ignore_assertion"/>
<Label value="headline" name="headline" background="#D35400" className="ignore_assertion"/>
<Label value="sub-headline" name="sub-headline" background="#8E44AD" className="ignore_assertion"/>
<Label value="sub-unordered-list" name="sub-unordered-list" background="#E0AED0" className="ignore_assertion"/>
<Label value="subsub-headline" name="subsub-headline" background="#D5B4B4" className="ignore_assertion"/>
<Label value="chapter-title" name="chapter-title" background="#F7C8E0" className="ignore_assertion"/>
<Label value="placeholder-text" name="placeholder-text" background="#3498DB" className="ignore_assertion"/>
<Label value="formula" name="formula" background="#2ECC71" className="ignore_assertion"/>
<Label value="first-level-question" name="first-level-question" background="#E74C3C" className="ignore_assertion"/>
<Label value="second-level-question" name="second-level-question" background="#9B59B6" className="ignore_assertion"/>
<Label value="third-level-question" name="third-level-question" background="#FF9494" className="ignore_assertion"/>
<Label value="answer" name="answer" background="#2980B9" className="ignore_assertion"/>
<Label value="options" name="options" background="#E8DFCA" className="ignore_assertion"/>
<Label value="index" name="index" background="#FFCCB3" className="ignore_assertion"/>
<Label value="subsub-unordered-list" name="subsub-unordered-list" background="#AC87C5" className="ignore_assertion"/>
<Label value="table" name="table" background="#FAB1A0" className="ignore_assertion"/>
<Label value="table-caption" name="table-caption" background="#E17055" className="ignore_assertion"/>
<Label value="table-of-contents" name="table-of-contents" background="#9ED2C6" className="ignore_assertion"/>
<Label value="jumpline" name="jumpline" background="#F39C12" className="ignore_assertion"/>
<Label value="advertisement" name="advertisement" background="#1ABC9C" className="ignore_assertion"/>
<Label value="sidebar" name="sidebar" background="#F1C40F" className="ignore_assertion"/>
<Label value="flag" name="flag" background="#34495E" className="ignore_assertion"/>
<Label value="reference" name="reference" background="#27AE60" className="ignore_assertion"/>
<Label value="contact-info" name="contact-info" background="#D35400" className="ignore_assertion"/>
<Label value="website-link" name="website-link" background="#8CC0DE" className="ignore_assertion"/>
<Label value="third-level-question" name="third-level-question" background="#FF9494" className="ignore_assertion"/>
<Label value="unordered-list" name="unordered-list" background="#8E44AD" className="ignore_assertion"/>
<Label value="unsure" name="unsure" background="#D35400" className="ignore_assertion"/>
<Label value="website-link" name="website-link" background="#8CC0DE" className="ignore_assertion"/>

</Labels>
<Rectangle name="annotation_bboxes" toName="image_url" strokeWidth="3" className="ignore_assertion"/>
Expand Down
Loading