Skip to content

Commit

Permalink
Merge branch 'main' into page-template-inner
Browse files Browse the repository at this point in the history
  • Loading branch information
cee-chen authored Aug 7, 2023
2 parents 072842b + e08978e commit 7d8d02c
Show file tree
Hide file tree
Showing 6 changed files with 42 additions and 32 deletions.
13 changes: 1 addition & 12 deletions .ci/jobs/elastic+eui+pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,7 @@
project-type: multijob
concurrent: true
node: master
triggers:
- github-pull-request:
org-list:
- elastic
white-list:
- renovate
- renovatebot
allow-whitelist-orgs-as-admins: true
trigger-phrase: '(.*(?:jenkins\W+)?test\W+(?:this|it)(?:\W+please)?.*)|^retest$'
github-hooks: true
status-context: eui-ci
cancel-builds-on-update: true
triggers: [] # Pull request job can now only be triggered from Jenkins UI
builders:
- multijob:
name: run child jobs
Expand Down
6 changes: 3 additions & 3 deletions catalog-info.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ spec:
eui-team:
access_level: MANAGE_BUILD_AND_READ
everyone:
access_level: READ_ONLY
access_level: BUILD_AND_READ

############################ Pull request deploy docs #############################
# Deploy docs to cloud on PR
Expand Down Expand Up @@ -145,7 +145,7 @@ spec:
eui-team:
access_level: MANAGE_BUILD_AND_READ
everyone:
access_level: READ_ONLY
access_level: BUILD_AND_READ


############################ Pull request combined job #############################
Expand Down Expand Up @@ -188,7 +188,7 @@ spec:
eui-team:
access_level: MANAGE_BUILD_AND_READ
everyone:
access_level: READ_ONLY
access_level: BUILD_AND_READ


############################ Release deploy docs #############################
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@
],
"dependencies": {
"@hello-pangea/dnd": "^16.2.0",
"@types/chroma-js": "^2.0.0",
"@types/lodash": "^4.14.194",
"@types/numeral": "^0.0.28",
"@types/react-input-autosize": "^2.2.1",
Expand All @@ -74,10 +73,10 @@
"@types/refractor": "^3.0.0",
"@types/resize-observer-browser": "^0.1.5",
"@types/vfile-message": "^2.0.0",
"chroma-js": "^2.1.0",
"chroma-js": "^2.4.2",
"classnames": "^2.2.6",
"lodash": "^4.17.21",
"mdast-util-to-hast": "^10.0.0",
"mdast-util-to-hast": "^10.2.0",
"numeral": "^2.0.6",
"prop-types": "^15.6.0",
"react-dropzone": "^11.5.3",
Expand Down Expand Up @@ -147,6 +146,7 @@
"@testing-library/react-hooks": "^7.0.2",
"@testing-library/user-event": "^13.5.0",
"@types/cheerio": "^0.22.31",
"@types/chroma-js": "^2.4.0",
"@types/classnames": "^2.2.10",
"@types/enzyme": "^3.10.5",
"@types/jest": "^24.0.6",
Expand Down
21 changes: 12 additions & 9 deletions src-docs/src/views/modal/confirm_modal_loading.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,29 @@ import {

export default () => {
const [isLoading, setIsLoading] = useState(false);
const [isModalVisible, setIsModalVisible] = useState(false);
const [value, setValue] = useState('');

const searchTimeout = setTimeout(() => {
// Simulate a remotely-executed search.
setIsLoading(false);
}, 1200);

clearTimeout(searchTimeout);
let timeoutId: ReturnType<typeof setTimeout>;
const searchTimeout = () =>
setTimeout(() => {
// Simulate a remotely-executed search.
setIsLoading(false);
}, 1200);

const [isModalVisible, setIsModalVisible] = useState(false);
const showModal = () => {
setIsModalVisible(true);
setIsLoading(true);
timeoutId = searchTimeout();
};

const closeModal = () => {
setIsModalVisible(false);
setIsLoading(false);
clearTimeout(searchTimeout);
setValue('');
clearTimeout(timeoutId);
};

const [value, setValue] = useState('');
const onChange = (e: React.ChangeEvent<HTMLInputElement>) => {
setValue(e.target.value);
};
Expand Down
1 change: 0 additions & 1 deletion src-docs/src/views/skeleton/skeleton_example.js
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ const skeletonLivePropsSnippet = `<EuiSkeletonText

export const SkeletonExample = {
title: 'Skeleton',
isNew: true,
intro: (
<>
<EuiText>
Expand Down
27 changes: 23 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4453,10 +4453,10 @@
dependencies:
"@types/node" "*"

"@types/chroma-js@^2.0.0":
version "2.0.0"
resolved "https://registry.yarnpkg.com/@types/chroma-js/-/chroma-js-2.0.0.tgz#b0fc98c8625d963f14e8138e0a7961103303ab22"
integrity sha512-iomunXsXjDxhm2y1OeJt8NwmgC7RyNkPAOddlYVGsbGoX8+1jYt84SG4/tf6RWcwzROLx1kPXPE95by1s+ebIg==
"@types/chroma-js@^2.4.0":
version "2.4.0"
resolved "https://registry.yarnpkg.com/@types/chroma-js/-/chroma-js-2.4.0.tgz#476a16ae848c77478079d6749236fdb98837b92c"
integrity sha512-JklMxityrwjBTjGY2anH8JaTx3yjRU3/sEHSblLH1ba5lqcSh1LnImXJZO5peJfXyqKYWjHTGy4s5Wz++hARrw==

"@types/classnames@^2.2.10":
version "2.2.10"
Expand Down Expand Up @@ -7315,6 +7315,11 @@ chroma-js@^2.1.0:
dependencies:
cross-env "^6.0.3"

chroma-js@^2.4.2:
version "2.4.2"
resolved "https://registry.yarnpkg.com/chroma-js/-/chroma-js-2.4.2.tgz#dffc214ed0c11fa8eefca2c36651d8e57cbfb2b0"
integrity sha512-U9eDw6+wt7V8z5NncY2jJfZa+hUH8XEj8FQHgFJTrUFnJfXYf4Ml4adI2vXZOjqRDpFWtYVWypDfZwnJ+HIR4A==

chrome-trace-event@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz#234090ee97c7d4ad1a2c4beae27505deffc608a4"
Expand Down Expand Up @@ -14692,6 +14697,20 @@ mdast-util-to-hast@^10.0.0:
unist-util-position "^3.0.0"
unist-util-visit "^2.0.0"

mdast-util-to-hast@^10.2.0:
version "10.2.0"
resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-10.2.0.tgz#61875526a017d8857b71abc9333942700b2d3604"
integrity sha512-JoPBfJ3gBnHZ18icCwHR50orC9kNH81tiR1gs01D8Q5YpV6adHNO9nKNuFBCJQ941/32PT1a63UF/DitmS3amQ==
dependencies:
"@types/mdast" "^3.0.0"
"@types/unist" "^2.0.0"
mdast-util-definitions "^4.0.0"
mdurl "^1.0.0"
unist-builder "^2.0.0"
unist-util-generated "^1.0.0"
unist-util-position "^3.0.0"
unist-util-visit "^2.0.0"

mdast-util-to-string@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-1.1.0.tgz#27055500103f51637bd07d01da01eb1967a43527"
Expand Down

0 comments on commit 7d8d02c

Please sign in to comment.