-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4917 from SigNoz/release/v0.44
Release/v0.44
- Loading branch information
Showing
42 changed files
with
581 additions
and
313 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,31 @@ | ||
name: Jest Coverage - changed files | ||
|
||
on: | ||
pull_request: | ||
branches: develop | ||
|
||
jobs: | ||
build: | ||
runs-on: ubuntu-latest | ||
steps: | ||
- name: Checkout | ||
uses: actions/checkout@v4 | ||
with: | ||
ref: "refs/heads/develop" | ||
token: ${{ secrets.GITHUB_TOKEN }} # Provide the GitHub token for authentication | ||
|
||
- name: Fetch branch | ||
run: git fetch origin ${{ github.event.pull_request.head.ref }} | ||
|
||
- run: | | ||
git checkout ${{ github.event.pull_request.head.sha }} | ||
- uses: actions/setup-node@v4 | ||
with: | ||
node-version: lts/* | ||
|
||
- name: Install dependencies | ||
run: cd frontend && npm install -g yarn && yarn | ||
|
||
- name: npm run test:changedsince | ||
run: cd frontend && npm run i18n:generate-hash && npm run test:changedsince |
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
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
9 changes: 9 additions & 0 deletions
9
frontend/src/components/facingIssueBtn/FacingIssueBtn.style.scss
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,9 @@ | ||
.facing-issue-button { | ||
color: var(--bg-amber-500); | ||
border-color: var(--bg-amber-500); | ||
|
||
.ant-btn:hover { | ||
color: var(--bg-amber-400) !important; | ||
border-color: var(--bg-amber-300) !important; | ||
} | ||
} |
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,57 @@ | ||
import './FacingIssueBtn.style.scss'; | ||
|
||
import { Button } from 'antd'; | ||
import logEvent from 'api/common/logEvent'; | ||
import cx from 'classnames'; | ||
import { FeatureKeys } from 'constants/features'; | ||
import useFeatureFlags from 'hooks/useFeatureFlag'; | ||
import { defaultTo } from 'lodash-es'; | ||
import { HelpCircle } from 'lucide-react'; | ||
import { isCloudUser } from 'utils/app'; | ||
|
||
export interface FacingIssueBtnProps { | ||
eventName: string; | ||
attributes: Record<string, unknown>; | ||
message?: string; | ||
buttonText?: string; | ||
className?: string; | ||
} | ||
|
||
function FacingIssueBtn({ | ||
attributes, | ||
eventName, | ||
message = '', | ||
buttonText = '', | ||
className = '', | ||
}: FacingIssueBtnProps): JSX.Element | null { | ||
const handleFacingIssuesClick = (): void => { | ||
logEvent(eventName, attributes); | ||
|
||
if (window.Intercom) { | ||
window.Intercom('showNewMessage', defaultTo(message, '')); | ||
} | ||
}; | ||
|
||
const isChatSupportEnabled = useFeatureFlags(FeatureKeys.CHAT_SUPPORT)?.active; | ||
const isCloudUserVal = isCloudUser(); | ||
|
||
return isCloudUserVal && isChatSupportEnabled ? ( // Note: we would need to move this condition to license based in future | ||
<div className="facing-issue-button"> | ||
<Button | ||
className={cx('periscope-btn', 'facing-issue-button', className)} | ||
onClick={handleFacingIssuesClick} | ||
icon={<HelpCircle size={14} />} | ||
> | ||
{buttonText || 'Facing issues?'} | ||
</Button> | ||
</div> | ||
) : null; | ||
} | ||
|
||
FacingIssueBtn.defaultProps = { | ||
message: '', | ||
buttonText: '', | ||
className: '', | ||
}; | ||
|
||
export default FacingIssueBtn; |
1 change: 1 addition & 0 deletions
1
frontend/src/container/BillingContainer/BillingContainer.styles.scss
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,4 +1,5 @@ | ||
.billing-container { | ||
margin-bottom: 40px; | ||
padding-top: 36px; | ||
width: 65%; | ||
|
||
|
Oops, something went wrong.