fix: environment webhooks shows current date, not created date (#2555)

Co-authored-by: Ben Rometsch <[email protected]>

api/organisations/migrations/0043_add_created_at_and_updated_at_to_organisationwebhook.py

@@ -0,0 +1,33 @@
+# Generated by Django 3.2.20 on 2023-08-01 09:14
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organisations', '0042_alter_subscription_payment_method'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='organisationwebhook',
+            name='created_at',
+            field=models.DateTimeField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='organisationwebhook',
+            name='updated_at',
+            field=models.DateTimeField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='organisationwebhook',
+            name='created_at',
+            field=models.DateTimeField(auto_now_add=True, blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='organisationwebhook',
+            name='updated_at',
+            field=models.DateTimeField(auto_now=True, blank=True, null=True),
+        )
+    ]

api/organisations/models.py

@@ -253,6 +253,8 @@ class OrganisationWebhook(AbstractBaseExportableWebhookModel):
     organisation = models.ForeignKey(
         Organisation, on_delete=models.CASCADE, related_name="webhooks"
     )
+    created_at = models.DateTimeField(null=True, auto_now_add=True)
+    updated_at = models.DateTimeField(null=True, auto_now=True)
 
     class Meta:
         ordering = ("id",)  # explicit ordering to prevent pagination warnings

api/organisations/serializers.py

@@ -211,7 +211,7 @@ class PortalUrlSerializer(serializers.Serializer):
 class OrganisationWebhookSerializer(serializers.ModelSerializer):
     class Meta:
         model = OrganisationWebhook
-        fields = ("id", "url", "enabled", "secret")
+        fields = ("id", "url", "enabled", "secret", "created_at", "updated_at")
         read_only_fields = ("id",)
 
 

frontend/web/components/pages/EnvironmentSettingsPage.js

@@ -791,7 +791,7 @@ const EnvironmentSettingsPage = class extends Component {
                                   <Button theme='text'>{webhook.url}</Button>
                                   <div className='list-item-footer faint'>
                                     Created{' '}
-                                    {moment(webhook.created_date).format(
+                                    {moment(webhook.created_at).format(
                                       'DD/MMM/YYYY',
                                     )}
                                   </div>

frontend/web/components/pages/OrganisationSettingsPage.js

@@ -1248,12 +1248,14 @@ const OrganisationSettingsPage = class extends Component {
                                       <Button theme='text'>
                                         {webhook.url}
                                       </Button>
-                                      <div className='list-item-footer faint'>
-                                        Created{' '}
-                                        {moment(webhook.created_date).format(
-                                          'DD/MMM/YYYY',
-                                        )}
-                                      </div>
+                                      {webhook.created_at ? (
+                                        <div className='list-item-footer faint'>
+                                          Created{' '}
+                                          {moment(webhook.created_at).format(
+                                            'DD/MMM/YYYY',
+                                          )}
+                                        </div>
+                                      ) : null}
                                     </div>
                                     <Row>
                                       <Switch checked={webhook.enabled} />