Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/workflows/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ jobs:
exit 1

sast-code-scan:
needs: [determine-threshold]
runs-on: ubuntu-latest
steps:
- name: Checkout
Expand All @@ -138,7 +137,7 @@ jobs:
continue-on-error: true
with:
snyk_token: ${{ secrets.SNYK_TOKEN }}
severity_threshold: ${{ needs.determine-threshold.outputs.severity }}
severity_threshold: high
output_dir: ${{ env.OUTPUT_DIR }}
report_file: ${{ env.REPORT_FILE }}

Expand Down
1 change: 1 addition & 0 deletions community-modules/locale/src/ar-EG.ts
Original file line number Diff line number Diff line change
Expand Up @@ -829,6 +829,7 @@ export const AG_GRID_LOCALE_EG = {
calculatedColumnType: 'النوع',
calculatedColumnExpression: 'التعبير',
calculatedColumnExpressionPlaceholder: 'اكتب هنا',
calculatedColumnExpressionToolsLabel: 'إدراج',
calculatedColumnColumns: 'أعمدة',
calculatedColumnFunctions: 'الدوال',
calculatedColumnOperators: 'المعاملات',
Expand Down
1 change: 1 addition & 0 deletions community-modules/locale/src/bg-BG.ts
Original file line number Diff line number Diff line change
Expand Up @@ -835,6 +835,7 @@ export const AG_GRID_LOCALE_BG = {
calculatedColumnType: 'Тип',
calculatedColumnExpression: 'Израз',
calculatedColumnExpressionPlaceholder: 'Въведете тук',
calculatedColumnExpressionToolsLabel: 'Вмъкване',
calculatedColumnColumns: 'Колони',
calculatedColumnFunctions: 'Функции',
calculatedColumnOperators: 'Оператори',
Expand Down
1 change: 1 addition & 0 deletions community-modules/locale/src/cs-CZ.ts
Original file line number Diff line number Diff line change
Expand Up @@ -830,6 +830,7 @@ export const AG_GRID_LOCALE_CZ = {
calculatedColumnType: 'Typ',
calculatedColumnExpression: 'Výraz',
calculatedColumnExpressionPlaceholder: 'Pište zde',
calculatedColumnExpressionToolsLabel: 'Vložit',
calculatedColumnColumns: 'Sloupce',
calculatedColumnFunctions: 'Funkce',
calculatedColumnOperators: 'Operátory',
Expand Down
1 change: 1 addition & 0 deletions community-modules/locale/src/da-DK.ts
Original file line number Diff line number Diff line change
Expand Up @@ -833,6 +833,7 @@ export const AG_GRID_LOCALE_DK = {
calculatedColumnType: 'Type',
calculatedColumnExpression: 'Udtryk',
calculatedColumnExpressionPlaceholder: 'Skriv her',
calculatedColumnExpressionToolsLabel: 'Indsæt',
calculatedColumnColumns: 'Kolonner',
calculatedColumnFunctions: 'Funktioner',
calculatedColumnOperators: 'Operatorer',
Expand Down
1 change: 1 addition & 0 deletions community-modules/locale/src/de-DE.ts
Original file line number Diff line number Diff line change
Expand Up @@ -837,6 +837,7 @@ export const AG_GRID_LOCALE_DE = {
calculatedColumnType: 'Typ',
calculatedColumnExpression: 'Ausdruck',
calculatedColumnExpressionPlaceholder: 'Hier eingeben',
calculatedColumnExpressionToolsLabel: 'Einfügen',
calculatedColumnColumns: 'Spalten',
calculatedColumnFunctions: 'Funktionen',
calculatedColumnOperators: 'Operatoren',
Expand Down
1 change: 1 addition & 0 deletions community-modules/locale/src/el-GR.ts
Original file line number Diff line number Diff line change
Expand Up @@ -836,6 +836,7 @@ export const AG_GRID_LOCALE_GR = {
calculatedColumnType: 'Τύπος',
calculatedColumnExpression: 'Έκφραση',
calculatedColumnExpressionPlaceholder: 'Πληκτρολογήστε εδώ',
calculatedColumnExpressionToolsLabel: 'Εισαγωγή',
calculatedColumnColumns: 'Στήλες',
calculatedColumnFunctions: 'Συναρτήσεις',
calculatedColumnOperators: 'Τελεστές',
Expand Down
1 change: 1 addition & 0 deletions community-modules/locale/src/en-US.ts
Original file line number Diff line number Diff line change
Expand Up @@ -844,6 +844,7 @@ export const AG_GRID_LOCALE_EN = {
calculatedColumnType: 'Type',
calculatedColumnExpression: 'Expression',
calculatedColumnExpressionPlaceholder: 'Type here',
calculatedColumnExpressionToolsLabel: 'Insert',
calculatedColumnColumns: 'Columns',
calculatedColumnFunctions: 'Functions',
calculatedColumnOperators: 'Operators',
Expand Down
1 change: 1 addition & 0 deletions community-modules/locale/src/es-ES.ts
Original file line number Diff line number Diff line change
Expand Up @@ -835,6 +835,7 @@ export const AG_GRID_LOCALE_ES = {
calculatedColumnType: 'Tipo',
calculatedColumnExpression: 'Expresión',
calculatedColumnExpressionPlaceholder: 'Escriba aquí',
calculatedColumnExpressionToolsLabel: 'Insertar',
calculatedColumnColumns: 'Columnas',
calculatedColumnFunctions: 'Funciones',
calculatedColumnOperators: 'Operadores',
Expand Down
1 change: 1 addition & 0 deletions community-modules/locale/src/fa-IR.ts
Original file line number Diff line number Diff line change
Expand Up @@ -832,6 +832,7 @@ export const AG_GRID_LOCALE_IR = {
calculatedColumnType: 'نوع',
calculatedColumnExpression: 'عبارت',
calculatedColumnExpressionPlaceholder: 'اینجا بنویسید',
calculatedColumnExpressionToolsLabel: 'درج',
calculatedColumnColumns: 'ستون‌ها',
calculatedColumnFunctions: 'توابع',
calculatedColumnOperators: 'عملگرها',
Expand Down
1 change: 1 addition & 0 deletions community-modules/locale/src/fi-FI.ts
Original file line number Diff line number Diff line change
Expand Up @@ -833,6 +833,7 @@ export const AG_GRID_LOCALE_FI = {
calculatedColumnType: 'Tyyppi',
calculatedColumnExpression: 'Lauseke',
calculatedColumnExpressionPlaceholder: 'Kirjoita tähän',
calculatedColumnExpressionToolsLabel: 'Lisää',
calculatedColumnColumns: 'Sarakkeet',
calculatedColumnFunctions: 'Funktiot',
calculatedColumnOperators: 'Operaattorit',
Expand Down
1 change: 1 addition & 0 deletions community-modules/locale/src/fr-FR.ts
Original file line number Diff line number Diff line change
Expand Up @@ -839,6 +839,7 @@ export const AG_GRID_LOCALE_FR = {
calculatedColumnType: 'Type',
calculatedColumnExpression: 'Expression',
calculatedColumnExpressionPlaceholder: 'Saisissez ici',
calculatedColumnExpressionToolsLabel: 'Insérer',
calculatedColumnColumns: 'Colonnes',
calculatedColumnFunctions: 'Fonctions',
calculatedColumnOperators: 'Opérateurs',
Expand Down
1 change: 1 addition & 0 deletions community-modules/locale/src/he-IL.ts
Original file line number Diff line number Diff line change
Expand Up @@ -829,6 +829,7 @@ export const AG_GRID_LOCALE_IL = {
calculatedColumnType: 'סוג',
calculatedColumnExpression: 'ביטוי',
calculatedColumnExpressionPlaceholder: 'הקלד כאן',
calculatedColumnExpressionToolsLabel: 'הוספה',
calculatedColumnColumns: 'עמודות',
calculatedColumnFunctions: 'פונקציות',
calculatedColumnOperators: 'אופרטורים',
Expand Down
1 change: 1 addition & 0 deletions community-modules/locale/src/hr-HR.ts
Original file line number Diff line number Diff line change
Expand Up @@ -832,6 +832,7 @@ export const AG_GRID_LOCALE_HR = {
calculatedColumnType: 'Vrsta',
calculatedColumnExpression: 'Izraz',
calculatedColumnExpressionPlaceholder: 'Upišite ovdje',
calculatedColumnExpressionToolsLabel: 'Umetni',
calculatedColumnColumns: 'Stupci',
calculatedColumnFunctions: 'Funkcije',
calculatedColumnOperators: 'Operatori',
Expand Down
1 change: 1 addition & 0 deletions community-modules/locale/src/hu-HU.ts
Original file line number Diff line number Diff line change
Expand Up @@ -837,6 +837,7 @@ export const AG_GRID_LOCALE_HU = {
calculatedColumnType: 'Típus',
calculatedColumnExpression: 'Kifejezés',
calculatedColumnExpressionPlaceholder: 'Írjon ide',
calculatedColumnExpressionToolsLabel: 'Beszúrás',
calculatedColumnColumns: 'Oszlopok',
calculatedColumnFunctions: 'Függvények',
calculatedColumnOperators: 'Operátorok',
Expand Down
1 change: 1 addition & 0 deletions community-modules/locale/src/it-IT.ts
Original file line number Diff line number Diff line change
Expand Up @@ -836,6 +836,7 @@ export const AG_GRID_LOCALE_IT = {
calculatedColumnType: 'Tipo',
calculatedColumnExpression: 'Espressione',
calculatedColumnExpressionPlaceholder: 'Digita qui',
calculatedColumnExpressionToolsLabel: 'Inserisci',
calculatedColumnColumns: 'Colonne',
calculatedColumnFunctions: 'Funzioni',
calculatedColumnOperators: 'Operatori',
Expand Down
1 change: 1 addition & 0 deletions community-modules/locale/src/ja-JP.ts
Original file line number Diff line number Diff line change
Expand Up @@ -830,6 +830,7 @@ export const AG_GRID_LOCALE_JP = {
calculatedColumnType: '種類',
calculatedColumnExpression: '式',
calculatedColumnExpressionPlaceholder: 'ここに入力',
calculatedColumnExpressionToolsLabel: '挿入',
calculatedColumnColumns: '列',
calculatedColumnFunctions: '関数',
calculatedColumnOperators: '演算子',
Expand Down
1 change: 1 addition & 0 deletions community-modules/locale/src/ko-KR.ts
Original file line number Diff line number Diff line change
Expand Up @@ -830,6 +830,7 @@ export const AG_GRID_LOCALE_KR = {
calculatedColumnType: '유형',
calculatedColumnExpression: '식',
calculatedColumnExpressionPlaceholder: '여기에 입력',
calculatedColumnExpressionToolsLabel: '삽입',
calculatedColumnColumns: '열',
calculatedColumnFunctions: '함수',
calculatedColumnOperators: '연산자',
Expand Down
1 change: 1 addition & 0 deletions community-modules/locale/src/nb-NO.ts
Original file line number Diff line number Diff line change
Expand Up @@ -831,6 +831,7 @@ export const AG_GRID_LOCALE_NO = {
calculatedColumnType: 'Type',
calculatedColumnExpression: 'Uttrykk',
calculatedColumnExpressionPlaceholder: 'Skriv her',
calculatedColumnExpressionToolsLabel: 'Sett inn',
calculatedColumnColumns: 'Kolonner',
calculatedColumnFunctions: 'Funksjoner',
calculatedColumnOperators: 'Operatorer',
Expand Down
1 change: 1 addition & 0 deletions community-modules/locale/src/nl-NL.ts
Original file line number Diff line number Diff line change
Expand Up @@ -832,6 +832,7 @@ export const AG_GRID_LOCALE_NL = {
calculatedColumnType: 'Type',
calculatedColumnExpression: 'Expressie',
calculatedColumnExpressionPlaceholder: 'Typ hier',
calculatedColumnExpressionToolsLabel: 'Invoegen',
calculatedColumnColumns: 'Kolommen',
calculatedColumnFunctions: 'Functies',
calculatedColumnOperators: 'Operatoren',
Expand Down
1 change: 1 addition & 0 deletions community-modules/locale/src/pl-PL.ts
Original file line number Diff line number Diff line change
Expand Up @@ -835,6 +835,7 @@ export const AG_GRID_LOCALE_PL = {
calculatedColumnType: 'Typ',
calculatedColumnExpression: 'Wyrażenie',
calculatedColumnExpressionPlaceholder: 'Wpisz tutaj',
calculatedColumnExpressionToolsLabel: 'Wstaw',
calculatedColumnColumns: 'Kolumny',
calculatedColumnFunctions: 'Funkcje',
calculatedColumnOperators: 'Operatory',
Expand Down
1 change: 1 addition & 0 deletions community-modules/locale/src/pt-BR.ts
Original file line number Diff line number Diff line change
Expand Up @@ -835,6 +835,7 @@ export const AG_GRID_LOCALE_BR = {
calculatedColumnType: 'Tipo',
calculatedColumnExpression: 'Expressão',
calculatedColumnExpressionPlaceholder: 'Digite aqui',
calculatedColumnExpressionToolsLabel: 'Inserir',
calculatedColumnColumns: 'Colunas',
calculatedColumnFunctions: 'Funções',
calculatedColumnOperators: 'Operadores',
Expand Down
1 change: 1 addition & 0 deletions community-modules/locale/src/pt-PT.ts
Original file line number Diff line number Diff line change
Expand Up @@ -834,6 +834,7 @@ export const AG_GRID_LOCALE_PT = {
calculatedColumnType: 'Tipo',
calculatedColumnExpression: 'Expressão',
calculatedColumnExpressionPlaceholder: 'Escreva aqui',
calculatedColumnExpressionToolsLabel: 'Inserir',
calculatedColumnColumns: 'Colunas',
calculatedColumnFunctions: 'Funções',
calculatedColumnOperators: 'Operadores',
Expand Down
1 change: 1 addition & 0 deletions community-modules/locale/src/ro-RO.ts
Original file line number Diff line number Diff line change
Expand Up @@ -834,6 +834,7 @@ export const AG_GRID_LOCALE_RO = {
calculatedColumnType: 'Tip',
calculatedColumnExpression: 'Expresie',
calculatedColumnExpressionPlaceholder: 'Introduceți aici',
calculatedColumnExpressionToolsLabel: 'Inserare',
calculatedColumnColumns: 'Coloane',
calculatedColumnFunctions: 'Funcții',
calculatedColumnOperators: 'Operatori',
Expand Down
1 change: 1 addition & 0 deletions community-modules/locale/src/sk-SK.ts
Original file line number Diff line number Diff line change
Expand Up @@ -831,6 +831,7 @@ export const AG_GRID_LOCALE_SK = {
calculatedColumnType: 'Typ',
calculatedColumnExpression: 'Výraz',
calculatedColumnExpressionPlaceholder: 'Píšte sem',
calculatedColumnExpressionToolsLabel: 'Vložiť',
calculatedColumnColumns: 'Stĺpce',
calculatedColumnFunctions: 'Funkcie',
calculatedColumnOperators: 'Operátory',
Expand Down
1 change: 1 addition & 0 deletions community-modules/locale/src/sv-SE.ts
Original file line number Diff line number Diff line change
Expand Up @@ -833,6 +833,7 @@ export const AG_GRID_LOCALE_SE = {
calculatedColumnType: 'Typ',
calculatedColumnExpression: 'Uttryck',
calculatedColumnExpressionPlaceholder: 'Skriv här',
calculatedColumnExpressionToolsLabel: 'Infoga',
calculatedColumnColumns: 'Kolumner',
calculatedColumnFunctions: 'Funktioner',
calculatedColumnOperators: 'Operatorer',
Expand Down
1 change: 1 addition & 0 deletions community-modules/locale/src/tr-TR.ts
Original file line number Diff line number Diff line change
Expand Up @@ -835,6 +835,7 @@ export const AG_GRID_LOCALE_TR = {
calculatedColumnType: 'Tür',
calculatedColumnExpression: 'İfade',
calculatedColumnExpressionPlaceholder: 'Buraya yazın',
calculatedColumnExpressionToolsLabel: 'Ekle',
calculatedColumnColumns: 'Sütunlar',
calculatedColumnFunctions: 'Fonksiyonlar',
calculatedColumnOperators: 'Operatörler',
Expand Down
1 change: 1 addition & 0 deletions community-modules/locale/src/uk-UA.ts
Original file line number Diff line number Diff line change
Expand Up @@ -832,6 +832,7 @@ export const AG_GRID_LOCALE_UA = {
calculatedColumnType: 'Тип',
calculatedColumnExpression: 'Вираз',
calculatedColumnExpressionPlaceholder: 'Введіть тут',
calculatedColumnExpressionToolsLabel: 'Вставити',
calculatedColumnColumns: 'Стовпці',
calculatedColumnFunctions: 'Функції',
calculatedColumnOperators: 'Оператори',
Expand Down
1 change: 1 addition & 0 deletions community-modules/locale/src/ur-PK.ts
Original file line number Diff line number Diff line change
Expand Up @@ -830,6 +830,7 @@ export const AG_GRID_LOCALE_PK = {
calculatedColumnType: 'قسم',
calculatedColumnExpression: 'اظہار',
calculatedColumnExpressionPlaceholder: 'یہاں لکھیں',
calculatedColumnExpressionToolsLabel: 'داخل کریں',
calculatedColumnColumns: 'کالمز',
calculatedColumnFunctions: 'فنکشنز',
calculatedColumnOperators: 'آپریٹرز',
Expand Down
1 change: 1 addition & 0 deletions community-modules/locale/src/vi-VN.ts
Original file line number Diff line number Diff line change
Expand Up @@ -830,6 +830,7 @@ export const AG_GRID_LOCALE_VN = {
calculatedColumnType: 'Loại',
calculatedColumnExpression: 'Biểu thức',
calculatedColumnExpressionPlaceholder: 'Nhập tại đây',
calculatedColumnExpressionToolsLabel: 'Chèn',
calculatedColumnColumns: 'Cột',
calculatedColumnFunctions: 'Hàm',
calculatedColumnOperators: 'Toán tử',
Expand Down
1 change: 1 addition & 0 deletions community-modules/locale/src/zh-CN.ts
Original file line number Diff line number Diff line change
Expand Up @@ -829,6 +829,7 @@ export const AG_GRID_LOCALE_CN = {
calculatedColumnType: '类型',
calculatedColumnExpression: '表达式',
calculatedColumnExpressionPlaceholder: '在此输入',
calculatedColumnExpressionToolsLabel: '插入',
calculatedColumnColumns: '列',
calculatedColumnFunctions: '函数',
calculatedColumnOperators: '运算符',
Expand Down
1 change: 1 addition & 0 deletions community-modules/locale/src/zh-HK.ts
Original file line number Diff line number Diff line change
Expand Up @@ -829,6 +829,7 @@ export const AG_GRID_LOCALE_HK = {
calculatedColumnType: '類型',
calculatedColumnExpression: '運算式',
calculatedColumnExpressionPlaceholder: '在此輸入',
calculatedColumnExpressionToolsLabel: '插入',
calculatedColumnColumns: '欄',
calculatedColumnFunctions: '函數',
calculatedColumnOperators: '運算子',
Expand Down
1 change: 1 addition & 0 deletions community-modules/locale/src/zh-TW.ts
Original file line number Diff line number Diff line change
Expand Up @@ -829,6 +829,7 @@ export const AG_GRID_LOCALE_TW = {
calculatedColumnType: '類型',
calculatedColumnExpression: '運算式',
calculatedColumnExpressionPlaceholder: '在此輸入',
calculatedColumnExpressionToolsLabel: '插入',
calculatedColumnColumns: '欄位',
calculatedColumnFunctions: '函式',
calculatedColumnOperators: '運算子',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@

.ag-calculated-column-expression-wrap {
display: flex;
flex-direction: column;
flex: 1 1 auto;
gap: var(--ag-grid-size);

.ag-text-area {
flex: 1 1 auto;
}
Expand All @@ -26,6 +29,7 @@
.ag-text-area-input {
height: 100%;
resize: none;
padding-top: calc(var(--ag-grid-size) / 2);
}
}

Expand All @@ -36,25 +40,20 @@

.ag-calculated-column-expression-tools {
display: flex;
gap: calc(var(--ag-grid-size) / 2);
}

.ag-calculated-column-expression-tool {
flex: 1 1 0;
min-width: 0;
border: var(--ag-borders) var(--ag-border-color);
border-radius: var(--ag-border-radius);
padding: calc(var(--ag-grid-size) / 2) var(--ag-grid-size);
background: var(--ag-background-color);
color: var(--ag-foreground-color);
cursor: pointer;
font: inherit;

&:hover {
background-color: var(--ag-row-hover-color);
.ag-group-container {
flex: 1 1 auto;
justify-content: end;
gap: var(--ag-grid-size);
flex-wrap: nowrap;
align-items: center;
}
}

.ag-standard-button.ag-calculated-column-expression-tool {
padding: calc(var(--ag-grid-size) / 2);
}

.ag-calculated-column-suggestion-path {
display: flex;
align-items: center;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1397,20 +1397,5 @@
"url": "./notes/#api-reference"
}
}
},
"calculatedColumns": {
"meta": {
"displayName": "Calculated Columns",
"page": {
"name": "Calculated Columns",
"url": "./calculated-columns/"
}
},
"openCalculatedColumnDialog": {
"more": {
"name": "Calculated Columns API",
"url": "./calculated-columns/#api"
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -1022,7 +1022,7 @@
"processFileInput": {
"more": {
"name": "File Input Overlay",
"url": "./overlays-overview/#file-input-overlay"
"url": "./overlays-provided/#file-input"
}
}
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,21 @@ const rowData: SalesRow[] = [
{ account: 'Pioneer Logistics', region: 'Americas', revenue: 214000, cost: 139000 },
{ account: 'Apex Manufacturing', region: 'EMEA', revenue: 198000, cost: 158000 },
{ account: 'Blue River Telecom', region: 'Americas', revenue: 276000, cost: 192000 },
{ account: 'Crestline Foods', region: 'EMEA', revenue: 167000, cost: 121000 },
{ account: 'Harbor Freight Co', region: 'Americas', revenue: 142000, cost: 99000 },
{ account: 'Atlas Mining', region: 'APAC', revenue: 251000, cost: 197000 },
{ account: 'Veridian Health', region: 'EMEA', revenue: 173000, cost: 128000 },
{ account: 'Quantum Software', region: 'Americas', revenue: 298000, cost: 176000 },
{ account: 'Redwood Hotels', region: 'APAC', revenue: 132000, cost: 104000 },
{ account: 'Ironbridge Steel', region: 'EMEA', revenue: 221000, cost: 183000 },
{ account: 'Lakeside Media', region: 'Americas', revenue: 96000, cost: 71000 },
{ account: 'Polar Shipping', region: 'EMEA', revenue: 188000, cost: 142000 },
{ account: 'Granite Insurance', region: 'Americas', revenue: 204000, cost: 149000 },
{ account: 'Cobalt Mining', region: 'APAC', revenue: 243000, cost: 186000 },
{ account: 'Meridian Airlines', region: 'EMEA', revenue: 312000, cost: 268000 },
{ account: 'Oakfield Farms', region: 'Americas', revenue: 87000, cost: 62000 },
{ account: 'Silverline Bank', region: 'APAC', revenue: 265000, cost: 191000 },
{ account: 'Horizon Telecom', region: 'EMEA', revenue: 154000, cost: 112000 },
];

const gridOptions: GridOptions<SalesRow> = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { expect, test } from '@utils/grid/test-utils';

test.agExample(import.meta, () => {
test.eachFramework('live preview calculated column evaluates revenue - cost', async ({ agIdFor }) => {
test.eachFramework('deferred apply mode calculated column evaluates revenue - cost', async ({ agIdFor }) => {
const profitHeader = agIdFor.headerCell('profit');
await expect(profitHeader).toContainText('Profit');
await expect(profitHeader).toHaveClass(/ag-calculated-column/);
Expand Down
Loading
Loading