Skip to content

Commit fb1ad41

Browse files
committed
feat: update flag discard unsave change
1 parent 28c8aac commit fb1ad41

21 files changed

Lines changed: 1142 additions & 412 deletions

File tree

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"hash": "27760afb",
3+
"configHash": "1587983f",
4+
"lockfileHash": "970590bd",
5+
"browserHash": "43888d6e",
6+
"optimized": {},
7+
"chunks": {}
8+
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"type": "module"
3+
}
Lines changed: 17 additions & 0 deletions
Loading
Lines changed: 14 additions & 0 deletions
Loading

ui/dashboard/src/@icons/index.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import IconAngleDown from './customized-icons/angle-down.svg?react';
22
import IconArrowDown from './customized-icons/arrow-down.svg?react';
33
import IconArrowLeft from './customized-icons/arrow-left.svg?react';
44
import IconArrowRight from './customized-icons/arrow-right.svg?react';
5+
import IconArrowUpDown from './customized-icons/arrow-up-down.svg?react';
56
import IconBackspace from './customized-icons/backspace.svg?react';
67
import IconBitbucket from './customized-icons/bitbucket.svg?react';
78
import IconBucketWhite from './customized-icons/bucket-white.svg?react';
@@ -60,6 +61,7 @@ import IconUnion from './customized-icons/union.svg?react';
6061
import IconUpload from './customized-icons/upload.svg?react';
6162
import IconUserOutlined from './customized-icons/user-outlined.svg?react';
6263
import IconUserSettings from './customized-icons/user-settings.svg?react';
64+
import IconWarningOutline from './customized-icons/warning-outline.svg?react';
6365
import IconWatch from './customized-icons/watch.svg?react';
6466
import IconWebhook from './customized-icons/webhook.svg?react';
6567
import IconBuilding from './sidebar-icons/building.svg?react';
@@ -147,6 +149,7 @@ export {
147149
IconFlagSwitch,
148150
IconFlagNumber,
149151
IconFlagString,
152+
IconWarningOutline,
150153
IconFlagJSON,
151154
IconWatch,
152155
IconPlus,
@@ -179,6 +182,7 @@ export {
179182
IconEnglishFlag,
180183
IconFlagNoTraffic,
181184
IconBucketWhite,
185+
IconArrowUpDown,
182186
// Special icons
183187
IconGoal,
184188
IconGoogle,

ui/dashboard/src/@locales/en/common.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,5 +293,8 @@
293293
"new-console": "New console",
294294
"old-console": "Old console",
295295
"discard": "Discard changes",
296-
"edit-rule": "<p>Edit rule</p>"
296+
"edit-rule": "Edit rule",
297+
"add-rule":"Add rule",
298+
"include":"include",
299+
"not-include":"not include"
297300
}

ui/dashboard/src/@locales/en/form.json

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,14 @@
358358
"discard-unsaved-changes": "Discard unsaved changes",
359359
"prerequisite-discard-desc": "{{action}} prerequisite flag <b>{{flagName}}</b> with variation",
360360
"individual-discard-desc": "{{action}} <b>{{flagName}}</b> to <variantElement /> for user",
361-
"custom-rule-discard-desc": "{{action}} clause with <b>{{clauseLabel}}</b>",
362-
"custom-rule-clause-value-discard-desc": "{{action}} value {{value}} from clause <b>{{clauseLabel}}</b>",
363-
"custom-rule-strategy-discard-desc": "{{action}} rule variation to"
361+
"custom-rule-discard-desc": "{{action}} clause with ",
362+
"custom-rule-clause-value-discard-desc": "{{action}} value <b>{{value}}</b> from clause ",
363+
"custom-rule-strategy-discard-desc": "{{action}} rule variation to",
364+
"custom-rule-strategy-add-new-discard-desc" :"Add rule {{clauseLabel}} serve",
365+
"custom-rule-reorder-discard-desc":"Reorder rules",
366+
"custom-rule-audience-discard-desc":"{{action}} audience traffic allocation with",
367+
"custom-rule-audience-not-include-desc":"Not included in this allocation <b>{{percent}}%</b> will be served <b>{{variation}}</b>",
368+
"custom-rule-audience-include-desc":"Included in this allocation <b>{{percent}}%</b> will be served",
369+
"custom-rule-default-strategy-discard-desc": "Set default rule to",
370+
"custom-rule-default-audience-discard-desc": "Set default audience to"
364371
}

ui/dashboard/src/@locales/ja/common.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,5 +293,6 @@
293293
"new-console": "新コンソール",
294294
"old-console": "旧コンソール",
295295
"discard": "変更を破棄",
296-
"edit-rule": "<p>ルール編集</p>"
296+
"edit-rule": "<p>ルール編集</p>",
297+
"add-rule": "ルールを追加"
297298
}

ui/dashboard/src/@locales/ja/form.json

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -355,10 +355,17 @@
355355
"name-desc-search-placeholder": "名前、説明を検索...",
356356
"email-search-placeholder": "メールアドレスを検索...",
357357
"name-search-placeholder": "名前を検索...",
358-
"discard-unsaved-changes": "保存されていない変更を破棄",
359-
"prerequisite-discard-desc": "{{action}} prerequisite flag <b>{{flagName}}</b> with variation",
360-
"individual-discard-desc": "{{action}} <b>{{flagName}}</b> to <variantElement /> for user",
361-
"custom-rule-discard-desc": "<b>{{clauseLabel}}</b>を含む条項を{{action}}",
362-
"custom-rule-clause-value-discard-desc": "条項 <b>{{clauseLabel}}</b> から値 {{value}} を{{action}}",
363-
"custom-rule-strategy-discard-desc": "{{action}} rule variation to"
358+
"discard-form:discard-rule.discard-unsaved-changes": "未保存の変更を破棄しますか?",
359+
"prerequisite-discard-desc": "前提フラグ <b>{{flagName}}</b>(バリエーション付き)を{{action}}",
360+
"individual-discard-desc": "{{action}} ユーザーに対して <variantElement /> に <b>{{flagName}}</b> を設定",
361+
"custom-rule-discard-desc": "{{action}} 条件を",
362+
"custom-rule-clause-value-discard-desc": "{{action}} 条件から値 <b>{{value}}</b> を",
363+
"custom-rule-strategy-discard-desc": "{{action}} ルールのバリエーションを",
364+
"custom-rule-strategy-add-new-discard-desc": "ルール {{clauseLabel}} を追加して配信",
365+
"custom-rule-reorder-discard-desc": "ルールを並べ替える",
366+
"custom-rule-audience-discard-desc": "{{action}} オーディエンスのトラフィック配分を",
367+
"custom-rule-audience-not-include-desc": "<p>この配分に含まれていない <b>{{percent}}%</b> には <b>{{variation}}</b> が提供されます</p>",
368+
"custom-rule-audience-include-desc": "<p>この配分に含まれている <b>{{percent}}%</b> には提供されます</p>",
369+
"custom-rule-default-strategy-discard-desc": "デフォルトルールに設定",
370+
"custom-rule-default-audience-discard-desc": "デフォルトオーディエンスに設定します"
364371
}

ui/dashboard/src/@types/feature.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ export interface FeatureRuleClause {
7373
attribute: string;
7474
operator: FeatureRuleClauseOperator;
7575
values: string[];
76-
type?: RuleClauseType;
76+
type: RuleClauseType;
7777
}
7878

7979
export interface FeatureRule {

0 commit comments

Comments
 (0)