Skip to content
This repository has been archived by the owner on Apr 18, 2024. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'origin/master' into fb-leap-615/spaces-…
Browse files Browse the repository at this point in the history
…in-text-results-docs
  • Loading branch information
hlomzik committed Feb 15, 2024
2 parents af738d8 + cb578ca commit bcdaa78
Show file tree
Hide file tree
Showing 40 changed files with 875 additions and 275 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_bundle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
# ci can be skipped with `[skip ci]` prefix in message
if: "!contains(github.event.head_commit.message, 'skip ci')"
steps:
- uses: hmarr/debug-action@v2.1.0
- uses: hmarr/debug-action@v3.0.0

- name: "Checkout codebase"
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cancel_cicd_pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ jobs:
cancel:
runs-on: ubuntu-latest
steps:
- uses: hmarr/debug-action@v2.1.0
- uses: hmarr/debug-action@v3.0.0
- run: echo CI/CD Pipeline-${{ github.event.pull_request.number || github.event.pull_request.head.ref || github.ref_name }}
2 changes: 1 addition & 1 deletion .github/workflows/e2e_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
# ci can be skipped with `[skip ci]` prefix in message
if: "!contains(github.event.head_commit.message, 'skip ci')"
steps:
- uses: hmarr/debug-action@v2.1.0
- uses: hmarr/debug-action@v3.0.0

- name: "Checkout codebase"
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/eslint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
# ci can be skipped with `[skip ci]` prefix in message
if: "!contains(github.event.head_commit.message, 'skip ci')"
steps:
- uses: hmarr/debug-action@v2.1.0
- uses: hmarr/debug-action@v3.0.0

- name: "Checkout codebase"
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/fun_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
# ci can be skipped with `[skip ci]` prefix in message
if: "!contains(github.event.head_commit.message, 'skip ci')"
steps:
- uses: hmarr/debug-action@v2.1.0
- uses: hmarr/debug-action@v3.0.0

- name: "Checkout codebase"
uses: actions/checkout@v4
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/git-command.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 3
steps:
- uses: hmarr/debug-action@v2.1.0
- uses: hmarr/debug-action@v3.0.0

- name: Add Workflow link to command comment
uses: peter-evans/create-or-update-comment@v3
uses: peter-evans/create-or-update-comment@v4
with:
token: ${{ secrets.GIT_PAT }}
repository: ${{ github.event.client_payload.github.payload.repository.full_name }}
Expand Down Expand Up @@ -50,7 +50,7 @@ jobs:
echo "merge_conflict=$(git merge-tree $(git merge-base HEAD origin/$SLASH_COMMAND_ARG_BRANCH) origin/$SLASH_COMMAND_ARG_BRANCH HEAD | grep '<<')" >> $GITHUB_OUTPUT
- name: Add reaction to command comment on merge conflict
uses: peter-evans/create-or-update-comment@v3
uses: peter-evans/create-or-update-comment@v4
if: ${{ steps.check-conflict.outputs.merge_conflict }}
with:
token: ${{ secrets.GIT_PAT }}
Expand Down Expand Up @@ -81,7 +81,7 @@ jobs:
- name: Add reaction to command comment on nothing to do
if: ${{ !steps.check-conflict.outputs.merge_conflict && steps.commit_and_push.outputs.changes == 'no' }}
uses: peter-evans/create-or-update-comment@v3
uses: peter-evans/create-or-update-comment@v4
with:
token: ${{ secrets.GIT_PAT }}
repository: ${{ github.event.client_payload.github.payload.repository.full_name }}
Expand All @@ -92,7 +92,7 @@ jobs:

- name: Add reaction to command comment on success
if: ${{ !steps.check-conflict.outputs.merge_conflict && steps.commit_and_push.outputs.changes == 'yes' }}
uses: peter-evans/create-or-update-comment@v3
uses: peter-evans/create-or-update-comment@v4
with:
token: ${{ secrets.GIT_PAT }}
repository: ${{ github.event.client_payload.github.payload.repository.full_name }}
Expand All @@ -103,7 +103,7 @@ jobs:
reactions: "+1"

- name: Add reaction to command comment on failure
uses: peter-evans/create-or-update-comment@v3
uses: peter-evans/create-or-update-comment@v4
if: failure()
with:
token: ${{ secrets.GIT_PAT }}
Expand All @@ -119,7 +119,7 @@ jobs:
timeout-minutes: 1
steps:
- name: Update comment
uses: peter-evans/create-or-update-comment@v3
uses: peter-evans/create-or-update-comment@v4
with:
token: ${{ secrets.GIT_PAT }}
repository: ${{ github.event.client_payload.github.payload.repository.full_name }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/help-command.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
steps:
- name: Update comment if empty
if: ${{ github.event.client_payload.slash_command.args.all == '' }}
uses: peter-evans/create-or-update-comment@v3
uses: peter-evans/create-or-update-comment@v4
with:
token: ${{ secrets.GIT_PAT }}
repository: ${{ github.event.client_payload.github.payload.repository.full_name }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/jira-command.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 3
steps:
- uses: hmarr/debug-action@v2.1.0
- uses: hmarr/debug-action@v3.0.0

- name: Add Workflow link to command comment
uses: peter-evans/create-or-update-comment@v3
uses: peter-evans/create-or-update-comment@v4
with:
token: ${{ secrets.GIT_PAT }}
repository: ${{ github.event.client_payload.github.payload.repository.full_name }}
Expand Down Expand Up @@ -64,7 +64,7 @@ jobs:
type: ${{ github.event.client_payload.slash_command.args.unnamed.arg2 || 'task' }}

- name: Add reaction to command comment on success
uses: peter-evans/create-or-update-comment@v3
uses: peter-evans/create-or-update-comment@v4
with:
token: ${{ secrets.GIT_PAT }}
repository: ${{ github.event.client_payload.github.payload.repository.full_name }}
Expand All @@ -74,7 +74,7 @@ jobs:
reactions: "+1"

- name: Add reaction to command comment on failure
uses: peter-evans/create-or-update-comment@v3
uses: peter-evans/create-or-update-comment@v4
if: failure()
with:
token: ${{ secrets.GIT_PAT }}
Expand All @@ -91,7 +91,7 @@ jobs:
timeout-minutes: 1
steps:
- name: Update comment
uses: peter-evans/create-or-update-comment@v3
uses: peter-evans/create-or-update-comment@v4
with:
token: ${{ secrets.GIT_PAT }}
repository: ${{ github.event.client_payload.github.payload.repository.full_name }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pr-labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,17 @@ jobs:
pull-requests: write
steps:

- uses: hmarr/debug-action@v2.1.0
- uses: hmarr/debug-action@v3.0.0

- name: "Validate PR's title"
uses: thehanimo/[email protected].1
uses: thehanimo/[email protected].2
with:
GITHUB_TOKEN: ${{ github.token }}
pass_on_octokit_error: false
configuration_path: ".github/pr-title-checker-config.json"

- name: "Set PR's label based on title"
uses: release-drafter/release-drafter@v5.25.0
uses: release-drafter/release-drafter@v6.0.0
with:
disable-releaser: true
config-name: autolabeler.yml
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-set-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
permissions:
contents: write
steps:
- uses: hmarr/debug-action@v2.1.0
- uses: hmarr/debug-action@v3.0.0

- name: Checkout LSF
uses: actions/checkout@v4
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/slash-command-dispatch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
timeout-minutes: 1
runs-on: ubuntu-latest
steps:
- uses: hmarr/debug-action@v2.1.0
- uses: hmarr/debug-action@v3.0.0

- name: 'Validate command'
id: determine_command
Expand Down Expand Up @@ -51,7 +51,7 @@ jobs:
- name: Slash Command Dispatch for Issues
id: scd_issues
if: ${{ steps.determine_command.outputs.command_state != 'unknown' && steps.determine_command.outputs.is_issue_command == 'true' }}
uses: peter-evans/slash-command-dispatch@v3
uses: peter-evans/slash-command-dispatch@v4
with:
token: ${{ secrets.GIT_PAT }}
reaction-token: ${{ secrets.GIT_PAT }}
Expand All @@ -62,7 +62,7 @@ jobs:
- name: Slash Command Dispatch for PRs
id: scd_prs
if: ${{ steps.determine_command.outputs.command_state != 'unknown' && steps.determine_command.outputs.is_issue_command != 'true' }}
uses: peter-evans/slash-command-dispatch@v3
uses: peter-evans/slash-command-dispatch@v4
with:
token: ${{ secrets.GIT_PAT }}
reaction-token: ${{ secrets.GIT_PAT }}
Expand All @@ -72,7 +72,7 @@ jobs:

- name: Edit comment with error message
if: ${{ steps.determine_command.outputs.command_state == 'unknown' }}
uses: peter-evans/create-or-update-comment@v3
uses: peter-evans/create-or-update-comment@v4
with:
comment-id: ${{ github.event.comment.id }}
body: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sync-pr-ls.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
if: startsWith(github.head_ref, 'fb-')
runs-on: ubuntu-latest
steps:
- uses: hmarr/debug-action@v2.1.0
- uses: hmarr/debug-action@v3.0.0

- name: Sync PR
uses: actions/github-script@v7
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sync-pr-lse.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
if: startsWith(github.head_ref, 'fb-')
runs-on: ubuntu-latest
steps:
- uses: hmarr/debug-action@v2.1.0
- uses: hmarr/debug-action@v3.0.0

- name: Check user's membership
uses: actions/github-script@v7
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/tests_coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
name: unit-tests-coverage

- name: Upload coverage to Codecov
uses: codecov/codecov-action@v3.1.4
uses: codecov/codecov-action@v4.0.1
if: ${{ !github.event.pull_request.head.repo.fork }}
with:
fail_ci_if_error: true
Expand All @@ -47,7 +47,7 @@ jobs:
name: e2e-tests-coverage

- name: Upload coverage to Codecov
uses: codecov/codecov-action@v3.1.4
uses: codecov/codecov-action@v4.0.1
if: ${{ !github.event.pull_request.head.repo.fork }}
with:
fail_ci_if_error: true
Expand All @@ -69,7 +69,7 @@ jobs:
name: cypress-tests-coverage

- name: Upload coverage to Codecov
uses: codecov/codecov-action@v3.1.4
uses: codecov/codecov-action@v4.0.1
if: ${{ !github.event.pull_request.head.repo.fork }}
with:
fail_ci_if_error: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
# ci can be skipped with `[skip ci]` prefix in message
if: "!contains(github.event.head_commit.message, 'skip ci')"
steps:
- uses: hmarr/debug-action@v2.1.0
- uses: hmarr/debug-action@v3.0.0

- name: "Checkout codebase"
uses: actions/checkout@v4
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,6 @@ build/static/media/config.*.xml
# codecept screenshots
e2e/output
src/core/feature-flags/flags.json

# actions-hub
.github/actions-hub
3 changes: 2 additions & 1 deletion e2e/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
},
"resolutions": {
"debug": "^4.3.1",
"electron": "^22.3.25"
"electron": "^22.3.25",
"follow-redirects": "1.15.4"
}
}
8 changes: 4 additions & 4 deletions e2e/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2103,10 +2103,10 @@ fn-args@^4.0.0:
resolved "https://registry.yarnpkg.com/fn-args/-/fn-args-4.0.0.tgz#2e912f7a74c5e9ef25060bd60127d6a8680237a5"
integrity sha512-M9XSagc92ejQhi+7kjpFPAO59xKbGRsbOg/9dfwSj84DfzB0pj+Q81DVD1pKr084Xf2oICwUNI0pCvGORmD9zg==

follow-redirects@^1.14.0:
version "1.15.1"
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.1.tgz#0ca6a452306c9b276e4d3127483e29575e207ad5"
integrity sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==
follow-redirects@1.15.4, follow-redirects@^1.14.0:
version "1.15.4"
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.4.tgz#cdc7d308bf6493126b17ea2191ea0ccf3e535adf"
integrity sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==

foreground-child@^2.0.0:
version "2.0.0"
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,8 @@
"d3-color": "3.1.0",
"loader-utils": "2.0.4",
"@babel/traverse": "7.23.2",
"postcss": "8.4.31"
"postcss": "8.4.31",
"follow-redirects": "1.15.4"
},
"nohoist": [
"**/babel-preset-react-app/@babel/runtime"
Expand Down
6 changes: 4 additions & 2 deletions src/components/ImageView/Image.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ export const Image = observer(forwardRef(({
updateImageSize,
usedValue,
size,
overlay,
}, ref) => {
const imageSize = useMemo(() => {
return {
Expand All @@ -45,6 +46,7 @@ export const Image = observer(forwardRef(({

return (
<Block name="image" style={imageSize}>
{overlay}
<ImageProgress
downloading={imageEntity.downloading}
progress={imageEntity.progress}
Expand Down Expand Up @@ -76,7 +78,7 @@ const ImageProgress = observer(({
return downloading ? (
<Block name="image-progress">
<Elem name="message">Downloading image</Elem>
<Elem tag="progress" name="bar" value={progress} min="0" max={1} step={0.0001}/>
<Elem tag="progress" name="bar" value={progress} min="0" max={1} step={0.0001} />
</Block>
) : error ? (
<ImageLoadingError src={src} value={usedValue} />
Expand Down Expand Up @@ -121,6 +123,6 @@ const ImageLoadingError = ({ src, value }) => {
}, [src]);

return (
<ErrorMessage error={error}/>
<ErrorMessage error={error} />
);
};
Loading

0 comments on commit bcdaa78

Please sign in to comment.