Take #2 on rules modeling

Author: dcramer

src/sentry/migrations/0101_auto__add_rule.py renamed to src/sentry/migrations/0105_auto__add_rule.py

@@ -12,7 +12,7 @@ def forwards(self, orm):
         db.create_table('sentry_rule', (
             ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
             ('project', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['sentry.Project'])),
-            ('rule_id', self.gf('django.db.models.fields.CharField')(max_length=64, db_index=True)),
+            ('label', self.gf('django.db.models.fields.CharField')(max_length=64)),
             ('data', self.gf('django.db.models.fields.TextField')()),
             ('date_added', self.gf('django.db.models.fields.DateTimeField')(default=datetime.datetime.now)),
         ))
@@ -177,6 +177,14 @@ def backwards(self, orm):
             'key': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
             'value': ('django.db.models.fields.TextField', [], {})
         },
+        u'sentry.groupseen': {
+            'Meta': {'unique_together': "(('user', 'group'),)", 'object_name': 'GroupSeen'},
+            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['sentry.Group']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_seen': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['sentry.Project']"}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'db_index': 'False'})
+        },
         u'sentry.grouptag': {
             'Meta': {'unique_together': "(('project', 'key', 'value', 'group'),)", 'object_name': 'GroupTag', 'db_table': "'sentry_messagefiltervalue'"},
             'first_seen': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'null': 'True', 'db_index': 'True'}),
@@ -260,8 +268,8 @@ def backwards(self, orm):
             'data': ('django.db.models.fields.TextField', [], {}),
             'date_added': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['sentry.Project']"}),
-            'rule_id': ('django.db.models.fields.CharField', [], {'max_length': '64', 'db_index': 'True'})
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['sentry.Project']"})
         },
         u'sentry.searchdocument': {
             'Meta': {'unique_together': "(('project', 'group'),)", 'object_name': 'SearchDocument'},

src/sentry/models.py

@@ -419,14 +419,14 @@ class Meta:
 
 class Rule(Model):
     project = models.ForeignKey(Project)
-    rule_id = models.CharField(max_length=64, db_index=True)
+    label = models.CharField(max_length=64)
     data = GzippedDictField()
     date_added = models.DateTimeField(default=timezone.now)
 
     class Meta:
         db_table = 'sentry_rule'
 
-    __repr__ = sane_repr('project_id', 'rule_id')
+    __repr__ = sane_repr('project_id', 'label')
 
 
 class PendingTeamMember(Model):

src/sentry/static/sentry/scripts/app.js

@@ -625,7 +625,7 @@
         initialize: function(data){
             BasePage.prototype.initialize.apply(this, arguments);
 
-            _.bindAll(this, 'addAction', 'addCondition');
+            _.bindAll(this, 'addAction', 'addCondition', 'submitForm');
 
             this.actions_by_id = {};
             this.conditions_by_id = {};
@@ -636,13 +636,14 @@
             this.condition_sel = this.el.find('select[name="condition"]');
             this.condition_table = this.el.find('table.condition-list');
             this.condition_table_body = this.condition_table.find('tbody');
+            this.form = this.el.find('form');
 
             this.action_sel.empty();
             this.action_sel.append($('<option></option>'));
             $.each(data.actions, _.bind(function(_, action) {
                 var opt = $('<option></option>');
                 opt.attr({
-                    value: action.id,
+                    value: action.id
                 });
                 opt.text(action.label);
                 opt.appendTo(this.action_sel);
@@ -655,7 +656,7 @@
             $.each(data.conditions, _.bind(function(_, condition) {
                 var opt = $('<option></option>');
                 opt.attr({
-                    value: condition.id,
+                    value: condition.id
                 });
                 opt.text(condition.label);
                 opt.appendTo(this.condition_sel);
@@ -665,14 +666,24 @@
 
             this.action_sel.change(this.addAction);
             this.condition_sel.change(this.addCondition);
+
+            this.form.submit(this.submitForm);
         },
 
         addCondition: function() {
-            var condition = this.conditions_by_id[this.condition_sel.val()];
+            var node = this.conditions_by_id[this.condition_sel.val()];
             var row = $('<tr></tr>');
             var remove_btn = $('<button class="btn btn-small">Remove</button>');
+            var num = this.condition_table_body.find('tr').length;
+            var html = $('<div>' + node.html + '</div>');
+            var id_field = $('<input type="hidden" name="id[' + num + ']" value="' + node.id + '">');
 
-            row.append($('<td>' + condition.html + '</td>'));
+            // we need to update the id of all form elements
+            html.find('input, select, textarea').each(function(_, el){
+                var $el = $(el);
+                $el.attr('name', $el.attr('name') + '[' + num + ']');
+            });
+            row.append($('<td></td>').append(html).append(id_field));
             row.append($('<td></td>').append(remove_btn));
             row.appendTo(this.condition_table_body);
 
@@ -689,8 +700,16 @@
             var action = this.actions_by_id[this.action_sel.val()];
             var row = $('<tr></tr>');
             var remove_btn = $('<button class="btn btn-small">Remove</button>');
+            var num = this.action_table_body.find('tr').length;
+            var html = $('<div>' + action.html + '</div>');
+            var id_field = $('<input type="hidden" name="id[' + num + ']" value="' + action.id + '">');
 
-            row.append($('<td>' + action.html + '</td>'));
+            // we need to update the id of all form elements
+            html.find('input, select, textarea').each(function(_, el){
+                var $el = $(el);
+                $el.attr('name', $el.attr('name') + '[' + num + ']');
+            });
+            row.append($('<td></td>').append(html).append(id_field));
             row.append($('<td></td>').append(remove_btn));
             row.appendTo(this.action_table_body);
 
@@ -701,6 +720,35 @@
 
             this.action_sel.data("select2").clear();
             this.action_table.show();
+        },
+
+        submitForm: function(e) {
+            e.preventDefault();
+
+            var form_data = {
+                actions: [],
+                conditions: [],
+                label: this.form.find('input[name=label]').val()
+            };
+
+            // grab each table row in actions/conditions and create
+            // a suitable form element out of it
+            this.action_table_body.find('tr').each(function(_, el){
+                form_data.actions.push({
+                    id: $(el).data('action-id'),
+                    data: $('input, textarea, select', el).serializeArray() || {}
+                });
+            });
+
+            this.condition_table_body.find('tr').each(function(_, el){
+                form_data.conditions.push({
+                    id: $(el).data('condition-id'),
+                    data: $('input, textarea, select', el).serializeArray() || {}
+                });
+            });
+
+
+            console.log(JSON.stringify(form_data));
         }
 
     });

src/sentry/static/sentry/scripts/global.min.js

@@ -279,7 +279,7 @@
                 options = {
                     width: 'element',
                     allowClear: false,
-                    minimumResultsForSearch: 10,
+                    minimumResultsForSearch: 10
                 };
 
             if ($this.attr('data-allowClear')) {

src/sentry/static/sentry/scripts/utils.js

@@ -7,10 +7,18 @@
         <a href="{% url 'sentry-new-project-rule' project.team.slug project.slug %}" class="btn pull-right btn-primary">{% trans "New Rule" %}</a>
         <h2>{% trans "Rules" %}</h2>
     </div>
-    <p>Below you'll find each available action along with the triggers specified for it. Each action can have any number of triggers.</p>
-    <h4>Send a notification</h4>
-    <ul>
-    	<li>When an event is first seen</li>
-    	<li>When an event changes from resolved to unresolved</li>
-    </ul>
+    <table class="table table-striped">
+        <thead>
+            <tr>
+                <th>Rule</th>
+            </tr>
+        </thead>
+        <tbody>
+            {% for rule in rule_list %}
+                <tr>
+                    <td>{{ rule.label }}</td>
+                </tr>
+            {% endfor %}
+        </tbody>
+    </table>
 {% endblock %}

src/sentry/templates/sentry/projects/rules/list.html

@@ -1,59 +1,62 @@
 {% extends "sentry/projects/manage.html" %}
 
+{% load crispy_forms_tags %}
 {% load i18n %}
 {% load sentry_helpers %}
 
 {% block inner %}
     <div class="page-header">
         <h2>{% trans "New Rule" %}</h2>
     </div>
-    <form method="POST" action="" id="new-rule-form">
-        {% csrf_token %}
+    <div id="new-rule-form">
+        <form method="POST" action="">
+            {% csrf_token %}
 
-        <p>A rule consists of a single action and one or more triggers.</p>
-        <fieldset>
-            <div><legend>Details</legend></div>
-            {% include "sentry/partial/form_base.html" %}
-        </fieldset>
+            {{ form|as_crispy_errors }}
 
-        <fieldset>
-            <div><legend>Conditions</legend></div>
-            <p>When <select name="match" style="width:100px" class="select2-small">
-                <option value="all">all of</option>
-                <option value="any">any of</option>
-                <option value="none">none of</option>
-            </select> these conditions are met:</p>
-            <table class="condition-list table table-striped">
-                <colgroup>
-                    <col>
-                    <col style="width:50px">
-                </colgroup>
-                <tbody></tbody>
-            </table>
-            <div class="controls">
-                <select name="condition" class="span6" placeholder="add a condition"></select>
-            </div>
-        </fieldset>
+            <fieldset>
+                {{ form.label|as_crispy_field }}
+            </fieldset>
 
-        <fieldset>
-            <div><legend>Actions</legend></div>
-            <p>Take these actions every time this rules matches:</p>
-            <table class="action-list table table-striped">
-                <colgroup>
-                    <col>
-                    <col style="width:50px">
-                </colgroup>
-                <tbody></tbody>
-            </table>
-            <div class="controls">
-                <select name="action" class="span6" placeholder="add an action"></select>
-            </div>
-        </fieldset>
+            <fieldset>
+                <div><legend>Conditions</legend></div>
+                <p>When <select name="match" style="width:100px" class="select2-small">
+                    <option value="all">all of</option>
+                    <option value="any">any of</option>
+                    <option value="none">none of</option>
+                </select> these conditions are met:</p>
+                <table class="condition-list table table-striped">
+                    <colgroup>
+                        <col>
+                        <col style="width:50px">
+                    </colgroup>
+                    <tbody></tbody>
+                </table>
+                <div class="controls">
+                    <select name="condition" class="span6" placeholder="add a condition"></select>
+                </div>
+            </fieldset>
+
+            <fieldset>
+                <div><legend>Actions</legend></div>
+                <p>Take these actions every time this rules matches:</p>
+                <table class="action-list table table-striped">
+                    <colgroup>
+                        <col>
+                        <col style="width:50px">
+                    </colgroup>
+                    <tbody></tbody>
+                </table>
+                <div class="controls">
+                    <select name="action" class="span6" placeholder="add an action"></select>
+                </div>
+            </fieldset>
 
-        <div class="actions">
-            <button type="submit" class="btn btn-primary">{% trans "Save Rule" %}</button>
-        </div>
-    </form>
+            <div class="actions">
+                <button type="submit" class="btn btn-primary">{% trans "Save Rule" %}</button>
+            </div>
+        </form>
+    </div>
 
     <script>
     new app.NewProjectRulePage({

src/sentry/templates/sentry/projects/rules/new.html

@@ -428,17 +428,7 @@ def disable_project_plugin(request, team, project, slug):
 
 @has_access(MEMBER_OWNER)
 def list_rules(request, team, project):
-    from sentry.rules import RULES
-
-    rule_instance_list = sorted(
-        Rule.objects.filter(project=project),
-        key=lambda x: x.date_added
-    )
-    rule_list = []
-    for rule_inst in rule_instance_list:
-        rule_cls = RULES[rule_inst.rule_id]
-        rule = rule_cls(rule_inst)
-        rule_list.append((rule_inst, rule.render_label()))
+    rule_list = Rule.objects.filter(project=project)
 
     context = csrf(request)
     context.update({
@@ -456,6 +446,7 @@ def new_rule(request, team, project):
     from sentry.rules import RULES
 
     form = NewRuleForm(request.POST or None)
+    print request.POST
 
     if request.POST and form.is_valid():
         # rule_cls = RULES[selected_rule]