-
Notifications
You must be signed in to change notification settings - Fork 2.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: Cherry picked DIA-820 and LEAP-396 into release 1.11.0 (#5332)
* chore: Cherry picked DIA-820 into release 1.11.0 * fix: LEAP-396: More exhaustative IP validation for SSRF defenses, plus user configurability (#5316) * fix: LEAP-396: More exhaustative IP validation for SSRF, plus user configurability * unbotch * fix test * more testing * fix false positive finding from Bandit * ci: Build frontend Workflow run: https://github.com/HumanSignal/label-studio/actions/runs/7618278765 * [submodules] Copy src HumanSignal/dm2 Workflow run: https://github.com/HumanSignal/label-studio/actions/runs/7618518612 * [submodules] Copy src HumanSignal/dm2 Workflow run: https://github.com/HumanSignal/label-studio/actions/runs/7618540291 * ci: Build frontend Workflow run: https://github.com/HumanSignal/label-studio/actions/runs/7618557170 * fix submodules * fix submodules --------- Co-authored-by: robot-ci-heartex <87703623+robot-ci-heartex@users.noreply.github.com> Co-authored-by: Jo Booth <jo.m.booth@gmail.com> Co-authored-by: robot-ci-heartex <robot-ci-heartex@users.noreply.github.com> Co-authored-by: yyassi-heartex <104568407+yyassi-heartex@users.noreply.github.com>
- Loading branch information
1 parent
6a5f691
commit 2002e96
Showing
21 changed files
with
177 additions
and
41 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| { | ||
| "message": "feat: OPTIC-107: Draft saving on view all", | ||
| "commit": "b2006083fb40a3d5a1ee7979ff24497864dfcdac", | ||
| "branch": "master", | ||
| "message": "chore: Cherry picked DIA-820 into release 1.11.0", | ||
| "commit": "02f190d464e3236c17217e3089ee1892aa5919d9", | ||
| "branch": "ls-release/1.11.0 ", | ||
| "date": "2024-01-04T09:37:55Z" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
25 changes: 25 additions & 0 deletions
25
web/libs/datamanager/src/components/CellViews/ProjectCell.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| import { getRoot } from "mobx-state-tree"; | ||
|
|
||
| export const ProjectCell = (cell) => { | ||
| const { original, value } = cell; | ||
| const root = getRoot(original); | ||
| // TODO: turn this into a link to open the project later | ||
| const projectList = value | ||
| .map((projectRef) => ( | ||
| root.taskStore.associatedList.find(proj => proj.id === projectRef.project_id)?.title | ||
| )) | ||
| .filter(Boolean); | ||
|
|
||
| return ( | ||
| <div | ||
| style={{ | ||
| maxHeight: "100%", | ||
| overflow: "hidden", | ||
| fontSize: 12, | ||
| lineHeight: "16px", | ||
| }} | ||
| > | ||
| {projectList && projectList.join(", ")} | ||
| </div> | ||
| ); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters