Skip to content

Commit

Permalink
Merge pull request #67 from PagerDuty/release/0.7.1-beta.0
Browse files Browse the repository at this point in the history
  • Loading branch information
gsreynolds authored Jun 7, 2023
2 parents b0b2498 + 446179c commit 0f9996e
Show file tree
Hide file tree
Showing 15 changed files with 51 additions and 19 deletions.
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,15 @@

This repository hosts the source code for PagerDuty Live, an open-source, single page application which enables organisations to manage their PagerDuty incidents in real-time through a unified console view.

**Live URL: https://giranm.github.io/pd-live-react/**
**Live URL: https://pagerduty.github.io/pd-live-react/**

## :warning: Disclaimer

**This project is not officially supported by PagerDuty and therefore no issues can be reported to or resolved by PagerDuty Support.
This is an open-source project designed to be used in a safe/test environment before users can leverage on their primary domains.**

- Full Disclaimer: https://www.termsfeed.com/live/68d1a0f2-9e68-47d0-9623-68afe0c31f6d
- Further details on roadmap functionality, bugs, etc can be viewed on the [wiki](https://github.com/giranm/pd-live-react/wiki).
- For any issues, please raise a [GitHub issue](https://github.com/giranm/pd-live-react/issues/new) which can be tracked accordingly.
- For any issues, please raise a [GitHub issue](https://github.com/pagerduty/pd-live-react/issues/new) which can be tracked accordingly.

## Screenshot

Expand Down Expand Up @@ -99,7 +98,7 @@ To prepare PagerDuty Live for release, the current workflow should be carried ou
$ git push --set-upstream origin release/<VERSION>
```
6. Raise [pull requests](https://github.com/giranm/pd-live-react/pulls) to merge into `main` branch.
6. Raise [pull requests](https://github.com/pagerduty/pd-live-react/pulls) to merge into `main` branch.
7. Build static bundle via `$ yarn build` or use appropriate CI/CD workflow.
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "pd-live-react",
"homepage": "https://giranm.github.io/pd-live-react",
"version": "0.7.0-beta.0",
"homepage": "https://pagerduty.github.io/pd-live-react",
"version": "0.7.1-beta.0",
"private": true,
"dependencies": {
"@braintree/sanitize-url": "^6.0.2",
Expand Down
4 changes: 2 additions & 2 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<link rel="icon" href="%PUBLIC_URL%/favicon.png" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta name="description" content="Web site created using create-react-app" />
<meta name="description" content="An open-source, real-time, unified console to view and manage PagerDuty incidents" />
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<!--
manifest.json provides metadata used when your web app is installed on a
Expand Down Expand Up @@ -40,4 +40,4 @@
-->
</body>

</html>
</html>
4 changes: 2 additions & 2 deletions src/components/DisclaimerModal/DisclaimerModalComponent.js
Original file line number Diff line number Diff line change
Expand Up @@ -228,11 +228,11 @@ const DisclaimerModalComponent = ({
By visiting this page on our website:
{' '}
<a
href="https://github.com/giranm/pd-live-react"
href="https://github.com/pagerduty/pd-live-react"
rel="external nofollow noopener noreferrer"
target="_blank"
>
https://github.com/giranm/pd-live-react
https://github.com/pagerduty/pd-live-react
</a>
</li>
</ul>
Expand Down
10 changes: 9 additions & 1 deletion src/components/IncidentTable/IncidentTableComponent.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ import {
ContextMenu, MenuItem, ContextMenuTrigger,
} from 'react-contextmenu';

import {
useTranslation,
} from 'react-i18next';

import CheckboxComponent from './subcomponents/CheckboxComponent';
import EmptyIncidentsComponent from './subcomponents/EmptyIncidentsComponent';
import QueryActiveComponent from './subcomponents/QueryActiveComponent';
Expand Down Expand Up @@ -132,6 +136,9 @@ const IncidentTableComponent = ({
const {
currentUserLocale,
} = users;
const {
t,
} = useTranslation();

// React Table Config
const defaultColumn = useMemo(
Expand Down Expand Up @@ -368,7 +375,8 @@ const IncidentTableComponent = ({
exportTableDataToCsv(tableHook);
}}
>
Export CSV
$
{t('Export CSV')}
{tableHook.selectedFlatRows.length > 0
? ` (${tableHook.selectedFlatRows.length} rows)`
: ` (${tableHook.rows.length} rows)`}
Expand Down
23 changes: 16 additions & 7 deletions src/config/incident-table-columns.js
Original file line number Diff line number Diff line change
Expand Up @@ -675,13 +675,22 @@ export const customReactTableColumnSchema = (
value,
}) => {
// Determine if content should be rendered as link or plaintext
const sanitizedValue = sanitizeUrl(value);
if (validator.isURL(sanitizedValue)) {
return (
<a href={sanitizedValue} target="_blank" rel="noopener noreferrer" className="td-wrapper">
{sanitizedValue}
</a>
);
try {
const sanitizedValue = sanitizeUrl(value);
if (validator.isURL(sanitizedValue)) {
return (
<a
href={sanitizedValue}
target="_blank"
rel="noopener noreferrer"
className="td-wrapper"
>
{sanitizedValue}
</a>
);
}
} catch (e) {
console.log(e);
}
return <div className="td-wrapper">{value}</div>;
},
Expand Down
2 changes: 1 addition & 1 deletion src/config/version.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions src/locales/de/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,15 @@
"Current subdomain does not have the correct ability to use PagerDuty Live": "Die aktuelle Subdomain hat nicht die richtige Funktion aktiviert, PagerDuty Live zu verwenden",
"Custom": "Benutzerdefiniert",
"Custom Incident Action": "Benutzerdefinierte Vorfallaktion",
"Dark Mode": "Dunkler Modus",
"Decline": "Ablehnen",
"Default Since Date Lookback": "Standard seit Datumsrückblick",
"Description": "Beschreibung",
"Disclaimer & License": "Haftungsausschluss & Lizenz",
"error": "fehler",
"Escalate": "Eskalieren",
"Escalation Policy": "Eskalationsrichtlinie",
"Export CSV": "CSV exportieren",
"External References": "Externe Referenzen",
"External Systems": "Externe Systeme",
"Fetching Alerts": "Abrufen von Benachrichtigungen",
Expand Down
2 changes: 2 additions & 0 deletions src/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,15 @@
"Current subdomain does not have the correct ability to use PagerDuty Live": "Current subdomain does not have the correct ability to use PagerDuty Live",
"Custom": "Custom",
"Custom Incident Action": "Custom Incident Action",
"Dark Mode": "Dark Mode",
"Decline": "Decline",
"Default Since Date Lookback": "Default Since Date Lookback",
"Description": "Description",
"Disclaimer & License": "Disclaimer & License",
"error": "error",
"Escalate": "Escalate",
"Escalation Policy": "Escalation Policy",
"Export CSV": "Export CSV",
"External References": "External References",
"External Systems": "External Systems",
"Fetching Alerts": "Fetching Alerts",
Expand Down
2 changes: 2 additions & 0 deletions src/locales/es/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,15 @@
"Current subdomain does not have the correct ability to use PagerDuty Live": "El subdominio actual no tiene la capacidad correcta para usar PagerDuty Live",
"Custom": "Personalizado",
"Custom Incident Action": "Acción de incidente personalizada",
"Dark Mode": "Modo oscuro",
"Decline": "Rechazar",
"Default Since Date Lookback": "Vista previa de fecha de inicio predeterminada",
"Description": "Descripción",
"Disclaimer & License": "Aviso legal y licencia",
"error": "error",
"Escalate": "Escalar",
"Escalation Policy": "Política de Escalamiento",
"Export CSV": "Exportar CSV",
"External References": "Referencias Externas",
"External Systems": "Sistemas externos",
"Fetching Alerts": "Obteniendo alertas",
Expand Down
2 changes: 2 additions & 0 deletions src/locales/fr/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,15 @@
"Current subdomain does not have the correct ability to use PagerDuty Live": "Le sous-domaine actuel n'a pas la bonne capacité pour utiliser PagerDuty Live",
"Custom": "Personnalisé",
"Custom Incident Action": "Action d'incident personnalisée",
"Dark Mode": "Mode sombre",
"Decline": "Décliner",
"Default Since Date Lookback": "Défaut depuis la date de recherche",
"Description": "Description",
"Disclaimer & License": "Clause de non-responsabilité et licence (en anglais)",
"error": "erreur",
"Escalate": "Escalader",
"Escalation Policy": "Politique d'escalade",
"Export CSV": "Exporter CSV",
"External References": "Références externes",
"External Systems": "Systèmes externes",
"Fetching Alerts": "Récupération des alertes",
Expand Down
2 changes: 2 additions & 0 deletions src/locales/id/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,15 @@
"Current subdomain does not have the correct ability to use PagerDuty Live": "Subdomain saat ini tidak memiliki kemampuan untuk menggunakan PagerDuty Live",
"Custom": "Khusus",
"Custom Incident Action": "Tindakan Insiden Khusus",
"Dark Mode": "Mode Gelap",
"Decline": "Tolak",
"Default Since Date Lookback": "Periode tampilan default",
"Description": "Deskripsi",
"Disclaimer & License": "Sanggahan & Lisensi",
"error": "error",
"Escalate": "Eskalasi",
"Escalation Policy": "Kebijakan Eskalasi",
"Export CSV": "Ekspor CSV",
"External References": "Referensi eksternal",
"External Systems": "Sistem eksternal",
"Fetching Alerts": "Mengambil Peringatan",
Expand Down
2 changes: 2 additions & 0 deletions src/locales/ja/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,15 @@
"Current subdomain does not have the correct ability to use PagerDuty Live": "現在のサブドメインはPagerDuty Liveを使用するための十分な権限を持っていません",
"Custom": "カスタム",
"Custom Incident Action": "カスタムインシデントアクション",
"Dark Mode": "ダークモード",
"Decline": "拒否",
"Default Since Date Lookback": "デフォルト表示期間",
"Description": "説明",
"Disclaimer & License": "免責事項・ライセンス",
"error": "error",
"Escalate": "エスカレート",
"Escalation Policy": "エスカレーションポリシー",
"Export CSV": "CSVエクスポート",
"External References": "外部リファレンス",
"External Systems": "外部システム",
"Fetching Alerts": "アラートを取得中",
Expand Down
2 changes: 2 additions & 0 deletions src/locales/pt-br/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,15 @@
"Current subdomain does not have the correct ability to use PagerDuty Live": "O subdomínio atual não tem a capacidade correta para usar PagerDuty Live",
"Custom": "Personalizado",
"Custom Incident Action": "Ação de Incidente Personalizada",
"Dark Mode": "Modo Escuro",
"Decline": "Recusar",
"Default Since Date Lookback": "Retrospectiva a partir de Data Predefinida",
"Description": "Descrição",
"Disclaimer & License": "Aviso Legal & Licença",
"error": "erro",
"Escalate": "Escalar",
"Escalation Policy": "Política de Escalação",
"Export CSV": "Exportar CSV",
"External References": "Referências Externas",
"External Systems": "Sistemas Externos",
"Fetching Alerts": "Buscando Alertas",
Expand Down
2 changes: 2 additions & 0 deletions src/locales/pt/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,15 @@
"Current subdomain does not have the correct ability to use PagerDuty Live": "O subdomínio atual não tem a capacidade correta para usar PagerDuty Live",
"Custom": "Personalizado",
"Custom Incident Action": "Ação de Incidente Personalizada",
"Dark Mode": "Modo Escuro",
"Decline": "Recusar",
"Default Since Date Lookback": "Retrospetiva a partir de Data Predefinida",
"Description": "Descrição",
"Disclaimer & License": "Aviso Legal & Licença",
"error": "erro",
"Escalate": "Escalar",
"Escalation Policy": "Política de Escalação",
"Export CSV": "Exportar CSV",
"External References": "Referências Externas",
"External Systems": "Sistemas Externos",
"Fetching Alerts": "A obter Alertas",
Expand Down

0 comments on commit 0f9996e

Please sign in to comment.