-
Notifications
You must be signed in to change notification settings - Fork 19
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into content-audit
- Loading branch information
Showing
38 changed files
with
1,482 additions
and
380 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| const fs = require('fs'); | ||
| const path = require('path'); | ||
| const { Octokit } = require('@octokit/rest'); | ||
| const octokit = new Octokit({ auth: process.env.GH_PR_TOKEN }); | ||
| const surge = require('surge'); | ||
| const publishFn = surge().publish(); | ||
|
|
||
| // From github actions | ||
| const ghrepo = process.env.GITHUB_REPOSITORY || ''; | ||
|
|
||
| const owner = process.env.CIRCLE_PROJECT_USERNAME || ghrepo.split('/')[0]; // patternfly | ||
| const repo = process.env.CIRCLE_PROJECT_REPONAME || ghrepo.split('/')[1]; | ||
| const prnum = process.env.CIRCLE_PR_NUMBER || process.env.GH_PR_NUM; | ||
| const prbranch = process.env.CIRCLE_BRANCH || process.env.GITHUB_REF.split('/').pop(); | ||
|
|
||
| const uploadFolder = process.argv[2]; | ||
| if (!uploadFolder) { | ||
| console.log('Usage: upload-preview uploadFolder'); | ||
| process.exit(1); | ||
| } | ||
|
|
||
| const uploadFolderName = path.basename(uploadFolder); | ||
| let uploadURL = `${repo}-${prnum ? `pr-topology-${prnum}` : prbranch}`.replace(/[\/|\.]/g, '-'); | ||
|
|
||
| switch(uploadFolderName) { | ||
| case 'coverage': | ||
| uploadURL += '-a11y.surge.sh'; | ||
| break; | ||
| case 'public': | ||
| if (!prnum && prbranch === 'main') { | ||
| uploadURL = 'https://pf-extensions.surge.sh/'; | ||
| } | ||
| else { | ||
| uploadURL += '.surge.sh'; | ||
| } | ||
| break; | ||
| default: | ||
| uploadURL += `-${uploadFolderName}`; | ||
| uploadURL += '.surge.sh'; | ||
| break; | ||
| } | ||
|
|
||
| publishFn({ | ||
| project: uploadFolder, | ||
| p: uploadFolder, | ||
| domain: uploadURL, | ||
| d: uploadURL, | ||
| e: 'https://surge.surge.sh', | ||
| endpoint: 'https://surge.surge.sh' | ||
| }); | ||
|
|
||
| function tryAddComment(comment, commentBody) { | ||
| if (!commentBody.includes(comment)) { | ||
| return comment; | ||
| } | ||
| return ''; | ||
| } | ||
|
|
||
| if (prnum) { | ||
| octokit.issues.listComments({ | ||
| owner, | ||
| repo, | ||
| issue_number: prnum | ||
| }) | ||
| .then(res => res.data) | ||
| .then(comments => { | ||
| let commentBody = ''; | ||
| const existingComment = comments.find(comment => comment.user.login === 'patternfly-build'); | ||
| if (existingComment) { | ||
| commentBody += existingComment.body.trim(); | ||
| commentBody += '\n\n'; | ||
| } | ||
|
|
||
| if (uploadFolderName === 'public') { | ||
| commentBody += tryAddComment(`Preview: https://${uploadURL}`, commentBody); | ||
| } | ||
| else if (uploadFolderName === 'coverage') { | ||
| commentBody += tryAddComment(`A11y report: https://${uploadURL}`, commentBody); | ||
| } | ||
|
|
||
| if (existingComment) { | ||
| octokit.issues.updateComment({ | ||
| owner, | ||
| repo, | ||
| comment_id: existingComment.id, | ||
| body: commentBody | ||
| }).then(() => console.log('Updated comment!')); | ||
| } else { | ||
| octokit.issues.createComment({ | ||
| owner, | ||
| repo, | ||
| issue_number: prnum, | ||
| body: commentBody | ||
| }).then(() => console.log('Created comment!')); | ||
| } | ||
| }); | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| name: pr-preview | ||
| on: pull_request_target | ||
| jobs: | ||
| build-upload: | ||
| runs-on: ubuntu-latest | ||
| env: | ||
| SURGE_LOGIN: ${{ secrets.SURGE_LOGIN }} | ||
| SURGE_TOKEN: ${{ secrets.SURGE_TOKEN }} | ||
| GH_PR_TOKEN: ${{ secrets.GH_PR_TOKEN }} | ||
| GH_PR_NUM: ${{ github.event.number }} | ||
| steps: | ||
| - uses: actions/checkout@v2 | ||
| # Yes, we really want to checkout the PR | ||
| - run: | | ||
| git fetch origin pull/$GH_PR_NUM/head:tmp | ||
| git checkout tmp | ||
| - run: | | ||
| git rev-parse origin/main | ||
| git rev-parse HEAD | ||
| git rev-parse origin/main..HEAD | ||
| git log origin/main..HEAD --format="%b" | ||
| # Yes, we really want to checkout the PR | ||
| # Injected by generate-workflows.js | ||
| - uses: actions/setup-node@v1 | ||
| with: | ||
| node-version: '16' | ||
| - uses: actions/cache@v2 | ||
| id: yarn-cache | ||
| name: Load npm deps from cache | ||
| with: | ||
| path: '**/node_modules' | ||
| key: ${{ runner.os }}-yarn-14-${{ hashFiles('yarn.lock') }} | ||
| - run: yarn install --frozen-lockfile | ||
| if: steps.yarn-cache.outputs.cache-hit != 'true' | ||
| - run: yarn lint:js | ||
| name: Lint JS | ||
| if: always() | ||
| - run: yarn lint:md | ||
| name: Lint MD | ||
| if: always() | ||
| - run: yarn build | ||
| name: Build component groups | ||
| - uses: actions/cache@v2 | ||
| id: docs-cache | ||
| name: Load webpack cache | ||
| with: | ||
| path: '.cache' | ||
| key: ${{ runner.os }}-v4-${{ hashFiles('yarn.lock') }} | ||
| - run: yarn build:docs | ||
| name: Build docs | ||
| - run: node .github/upload-preview.js packages/module/public | ||
| name: Upload docs | ||
| if: always() |
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
36 changes: 20 additions & 16 deletions
36
packages/demo-app-ts/src/demos/pipelineGroupsDemo/DemoTaskEdge.tsx
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,24 +1,28 @@ | ||
| import * as React from 'react'; | ||
| import { observer } from 'mobx-react'; | ||
| import { Edge, EdgeTerminalType, GraphElement, TaskEdge } from '@patternfly/react-topology'; | ||
| import { | ||
| DEFAULT_SPACER_NODE_TYPE, | ||
| Edge, | ||
| EdgeTerminalType, | ||
| GraphElement, | ||
| TaskEdge, | ||
| WithSelectionProps | ||
| } from '@patternfly/react-topology'; | ||
|
|
||
| interface DemoTaskEdgeProps { | ||
| interface DemoTaskEdgeProps extends WithSelectionProps { | ||
| element: GraphElement; | ||
| } | ||
|
|
||
| const DemoTaskEdge: React.FunctionComponent<DemoTaskEdgeProps> = ({ element, ...props }) => { | ||
|
|
||
| const isDependency = (element as Edge).getTarget().getData()?.isDependency; | ||
|
|
||
| return ( | ||
| <TaskEdge | ||
| element={element as Edge} | ||
| endTerminalType={ | ||
| isDependency ? EdgeTerminalType.directional : EdgeTerminalType.none | ||
| } | ||
| {...props} | ||
| /> | ||
| ); | ||
| }; | ||
| const DemoTaskEdge: React.FunctionComponent<DemoTaskEdgeProps> = ({ element, ...props }) => ( | ||
| <TaskEdge | ||
| element={element as Edge} | ||
| endTerminalType={ | ||
| (element as Edge).getTarget().getType() !== DEFAULT_SPACER_NODE_TYPE | ||
| ? EdgeTerminalType.directional | ||
| : undefined | ||
| } | ||
| {...props} | ||
| /> | ||
| ); | ||
|
|
||
| export default observer(DemoTaskEdge); |
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
Oops, something went wrong.