diff --git a/webui/server/models/subscriber.js b/webui/server/models/subscriber.js index 309b0889b..4c95f3370 100644 --- a/webui/server/models/subscriber.js +++ b/webui/server/models/subscriber.js @@ -58,6 +58,7 @@ const Subscriber = new Schema({ }, pcc_rule: [{ flow: [{ + direction: Number, description: String }], qos: { diff --git a/webui/src/components/Subscriber/Edit.js b/webui/src/components/Subscriber/Edit.js index ce8cfb5ad..9a5c297b3 100644 --- a/webui/src/components/Subscriber/Edit.js +++ b/webui/src/components/Subscriber/Edit.js @@ -116,9 +116,6 @@ const schema = { "pre_emption_vulnerability": { "type": "number", "title": "Vulnerability*", - "default": 1, - "minimum": 0, - "maximum": 1, "enum": [1, 0], "enumNames": ["Disabled", "Enabled"], "default": 1, @@ -163,11 +160,22 @@ const schema = { "items": { "type": "object", "properties": { + "direction": { + "type": "number", + "title": "Flow Direction*", + "enum": [1, 2], + "enumNames": ["Downlink", "Uplink"], + "default": 1, + }, "description": { "type": "string", - "title": "Flow Description*", - "default": "permit in ip from any to any", - "required": true + "title": "Description*", + "default": "permit out ip from any to any", + "required": true, + "pattern": "^permit\\s+out", + "messages": { + "pattern": "Begin with reserved keyword 'permit out'." + } } } } @@ -307,7 +315,15 @@ const uiSchema = { "pcc_rule": { "items": { "flow": { - "ui:help": "Hint: See IPFilterRule in RFC 3588!" + "items": { + "direction": { + classNames: "col-xs-12" + }, + "description": { + classNames: "col-xs-12", + "ui:help": "Hint: Flow-Description(TS29.212), IPFilterRule(RFC 3588)", + }, + }, }, "qos": { "qci": { diff --git a/webui/src/components/Subscriber/View.js b/webui/src/components/Subscriber/View.js index 7e92fcd67..b957bb30f 100644 --- a/webui/src/components/Subscriber/View.js +++ b/webui/src/components/Subscriber/View.js @@ -142,7 +142,7 @@ const Pdn = styled.div` margin: 0px 32px; .small_data { - width: 40px; + width: 60px; font-size: 12px; margin: 4px; } @@ -301,10 +301,13 @@ const View = ({ visible, disableOnClickOutside, subscriber, onEdit, onDelete, on {pcc_rule['flow'] !== undefined && pcc_rule.flow.map(flow => -