Paged chronology (D804)

lib/GADS/API.pm

@@ -570,7 +570,7 @@ post '/api/settings/logo' => require_login sub {
     my $filecheck = GADS::Filecheck->instance;
     error __x"Files of mimetype {mimetype} are not allowed", mimetype => $filecheck->get_filetype($file)
         unless $filecheck->is_image($file);
-    
+
     $site->update({ site_logo => $file->content });
 
     content_type 'application/json';
@@ -584,6 +584,43 @@ post '/api/settings/logo' => require_login sub {
     );
 };
 
+get '/api/chronology/:id' => require_login sub {
+    my $user       = logged_in_user;
+    my $current_id = route_parameters->get('id');
+    my $page       = query_parameters->get('page') // 1;
+    my $last_record_id = query_parameters->get('last_record_id');
+
+    my $record = GADS::Record->new(
+        user   => $user,
+        schema => schema,
+    );
+
+    my %params = (
+        page => $page,
+    );
+
+    $params{last_record} = $last_record_id if $last_record_id;
+
+    $record->find_chronology_id($current_id, %params);
+
+    my $layout      = $record->layout;
+    my $base_url    = request->base;
+    my $last_page   = $record->last_chronology_page;
+    $last_record_id = $record->last_chronology_record->{record_id};
+
+    trace "Last record ID: $last_record_id";
+
+    return template 'chronology/chronology.tt' => {
+        record     => $record,
+        layout_obj => $layout,
+        page       => $page,
+        last_page  => $last_page == $page ? 1 : 0,
+        last_record_id => $last_record_id,
+    }, {
+        layout => undef, # Do not render page header, footer etc
+    };
+};
+
 sub _post_dashboard_widget {
     my $layout = shift;
     my $user   = logged_in_user;
@@ -666,7 +703,7 @@ sub _put_dashboard_widget_edit {
     my $widget = _get_widget_write(route_parameters->get('id'), route_parameters->get('dashboard_id'), $layout, $user);
 
     my $body = from_json(request->body);
-    
+
     $widget->title($body->{'title'});
     $widget->static(query_parameters->get('static') ? 1 : 0)
         if $widget->dashboard->is_shared;

lib/GADS/Record.pm

@@ -730,7 +730,14 @@ sub find_chronology_id
         or error __x"Record ID {id} not found", id => $current_id;
     my $instance_id = $current->instance_id;
     $self->_set_instance_id($current->instance_id);
-    $self->_find(current_id => $current_id, chronology => 1, current => $current);
+    my %args = (
+        current_id => $current_id,
+        chronology => 1,
+        chronology_page => $options{page} // 1,
+    );
+    $args{last_record_id} = $options{last_record_id}
+        if defined $options{last_record_id};
+    $self->_find(%args);
 }
 
 sub find_draftuser_id
@@ -826,6 +833,24 @@ sub clear
     $self->clear_id_count;
 }
 
+sub _get_record_for_chronology {
+    my ( $self, $record, $records, %find ) = @_;
+    return unless $find{chronology};
+
+    my @changed;
+
+    $records->rewind($record->edited_time->values->[0], %find);
+
+    $records->fetch_multivalues(
+        record_ids   => [$record->record_id],
+        retrieved    => [$record->{$record->record_id}],
+        records      => [$record],
+        is_draft     => $find{draftuser_id},
+        already_seen => $records->already_seen,
+        chronology   => 1,
+    );
+}
+
 # XXX This whole section is getting messy and duplicating a lot of code from
 # GADS::Records. Ideally this needs to share the same code.
 sub _find
@@ -838,6 +863,9 @@ sub _find
     error __"You do not have access to this deleted record"
         if $find{deleted} && !$self->layout->user_can("purge") && !$GADS::Schema::IGNORE_PERMISSIONS;
 
+    my $last_page;
+    my $last_record_id = $find{last_record_id};
+
     my %params = (
         user                    => $self->user,
         layout                  => $self->layout,
@@ -876,10 +904,28 @@ sub _find
         );
         # No linked here so that we get the ones needed in accordance with this loop (could be either)
         my @prefetches = $records->jpfetch(search => 1, %common); # Still need search in case of view limit
-        last if !@prefetches && !$first_run;
+        last unless @prefetches || $first_run; # Inverted - didn't like how the condition was (slightly) confusing.
         my %options = $find{current_id} || $find{draftuser_id} ? () : (root_table => 'record', no_current => 1);
         my $search = $records->search_query(linked => 1, chronology => $find{chronology}, rewind => $records->rewind_values, %common, %options);
-         # Still need search in case of view limit
+        if ($find{chronology}) {
+            my $record_search = $self->schema->resultset('Current')->find(
+                $find{current_id},
+            )->records->search(
+                {},
+                {
+                    select       => [ 'id' ],
+                    rows         => 10,
+                    page         => $find{chronology_page} // 1,
+                    result_class => 'DBIx::Class::ResultClass::HashRefInflator',
+                    order_by     => { '-desc' => 'created' },
+                }
+            );
+            my @ids = map { $_->{id} } $record_search->all;
+            unshift @ids, $last_record_id if defined $last_record_id;
+            $last_page = $record_search->pager->last_page == $find{chronology_page} ? 1: 0;
+            push @$search, { 'record_single.id' => { -in => \@ids } };
+        }
+        # Still need search in case of view limit
         @prefetches = $records->jpfetch(search => 1, linked => 0, %common, %options);
 
         my $root_table;
@@ -959,7 +1005,7 @@ sub _find
             join     => [@prefetches],
             columns  => \@columns_fetch,
         };
-        $params->{order_by} = 'record_single.created'
+        $params->{order_by} = { -desc => 'record_single.created'}
             if $find{chronology};
         my $result = $self->schema->resultset($root_table)->search(
             [
@@ -1045,7 +1091,7 @@ sub _find
                 set_record_created_user => $self->set_record_created_user,
             );
             # Set data for this original record to the current version (latest)
-            $self->record($record->{$record_ids[-1]});
+            $self->record($record->{$record_ids[0]});
         }
     }
     else {
@@ -1074,23 +1120,58 @@ sub _find
     if ($find{chronology})
     {
         my @chronology; my $last_record;
-        foreach my $record (@record_objects)
+        # First entry - this is the record as it currently stands
+        if ($find{chronology_page} == 1) {
+            my $record = $record_objects[0];
+            my @changed;
+
+            $self->_get_record_for_chronology($record, $records, %find);
+            foreach my $column ( @{ $record->columns_render } ) {
+                next if $column->internal;
+                my $datum = $record->fields->{ $column->id };
+                if($column->type eq 'curval') {
+                    my %new_ids = map { $_->{id} => $_ } @{$datum->values};
+                    my @values;
+                    foreach my $id (keys %new_ids)
+                    {
+                        my $new_value = $new_ids{$id};
+                        $new_value->{status} = "current";
+                        $new_value->{version_id} = $new_value->{record}->record_id;
+                        push @values, $new_value;
+                    }
+                    push @changed, $column->presentation(datum_presentation => $datum->presentation(values => \@values));
+                }
+                else {
+                    push @changed, $column->presentation(datum_presentation => $datum->presentation);
+                }
+            }
+
+            push @chronology,
+              {
+                editor   => $record->edited_user,
+                datetime => $record->edited_time,
+                changed  => \@changed,
+              };
+        } else {
+            unshift @record_objects, $self->last_chronology_record if $self->last_chronology_record;
+        }
+        # Show all changes from the original - ignore the last one as this will become the $last_record for comparison
+        foreach my $i (0 .. $#record_objects-1)
         {
-            $records->rewind($record->edited_time->values->[0]);
-            $records->fetch_multivalues(
-                record_ids   => [$record->record_id],
-                retrieved    => [$record->{$record->record_id}],
-                records      => [$record],
-                is_draft     => $find{draftuser_id},
-                already_seen => $records->already_seen,
-                chronology   => 1,
-            );
+            $record = $record_objects[$i+1];
+
+            $self->_get_record_for_chronology($record, $records, %find);
+            $last_record = $record;
+
+            $record = $record_objects[$i];
+            $self->_get_record_for_chronology($record, $records, %find);
+
             my @changed;
             foreach my $column (@{$record->columns_render})
             {
                 next if $column->internal;
                 my $datum = $record->fields->{$column->id};
-                my $last_datum = $last_record && $last_record->fields->{$column->id};
+                my $last_datum = $last_record->fields->{$column->id};
 
                 if (
                     (!$last_record && !$datum->blank)
@@ -1102,8 +1183,6 @@ sub _find
                         my %old_ids = map { $_->{id} => $_ } @{$last_datum->values};
                         my %new_ids = map { $_->{id} => $_ } @{$datum->values};
                         my @values;
-                        # Check each value for whether it is added, removed or changed.
-                        # Look through old values first
                         foreach my $id (keys %old_ids)
                         {
                             my $old_value = $old_ids{$id};
@@ -1135,16 +1214,12 @@ sub _find
                             $new_value->{version_id} = $new_value->{record}->record_id;
                             push @values, $new_value;
                         }
-                        foreach my $v (@values)
-                        {
-                        }
-                        push @changed, $column->presentation(datum_presentation => $datum->presentation(values => \@values))
+                        push @changed, $column->presentation(datum_presentation => $datum->presentation(values => \@values));
                     }
                     else {
-                        push @changed, $column->presentation(datum_presentation => $datum->presentation)
+                        push @changed, $column->presentation(datum_presentation => $datum->presentation);
                     }
                 }
-
             }
             push @chronology, {
                 editor   => $record->edited_user,
@@ -1153,12 +1228,54 @@ sub _find
             } if @changed; # There may have been changes, but not ones the user has access to
             $last_record = $record;
         }
-        $self->_set_chronology(\@chronology);
+        # If we're on the last page, return the record state as it was created
+        if($last_page) {
+            my $record = $record_objects[-1];
+            $self->_get_record_for_chronology($record, $records, %find);
+
+            my @changed;
+            foreach my $column ( @{ $record->columns_render } ) {
+                next if $column->internal;
+                my $datum = $record->fields->{ $column->id };
+                if($column->type eq 'curval') {
+                    my %new_ids = map { $_->{id} => $_ } @{$datum->values};
+                    my @values;
+                    foreach my $id (keys %new_ids)
+                    {
+                        my $new_value = $new_ids{$id};
+                        $new_value->{status} = "created";
+                        $new_value->{version_id} = $new_value->{record}->record_id;
+                        push @values, $new_value;
+                    }
+                    push @changed, $column->presentation(datum_presentation => $datum->presentation(values => \@values));
+                }
+                else {
+                    push @changed, $column->presentation(datum_presentation => $datum->presentation);
+                }
+            }
+            push @chronology,
+            {
+                editor   => $record->edited_user,
+                datetime => $record->edited_time,
+                changed  => \@changed,
+            };
+        }
+        $self->_set_last_chronology_page($last_page // 0);
+        $self->_set_last_chronology_record($last_record) if $last_record;
+        $self->_set_chronology([@chronology]);
     }
 
     $self; # Allow chaining
 }
 
+has last_chronology_record => (
+    is => 'rwp',
+);
+
+has last_chronology_page => (
+    is => 'rwp',
+);
+
 has chronology => (
     is => 'rwp',
 );
@@ -2418,7 +2535,7 @@ sub _field_write
                             # child records. This is used in chronology view to
                             # ensure the correct versions at the time of record
                             # edit are used
-                            version_datetime => $created, 
+                            version_datetime => $created,
                         );
                         push @{$self->_records_to_write_after}, $record
                             if $record->is_edited;

lib/GADS/Role/Presentation/Datum/Person.pm

@@ -16,17 +16,19 @@ sub _presentation_details {
         };
     }
 
-    for (
-        [$person->{freetext1}, $site->register_freetext1_name],
-        [$person->{freetext2}, $site->register_freetext2_name]
-    ) {
-        next unless $_->[0];
-
-        push @details, {
-            definition => $_->[1],
-            value      => $_->[0],
-            type       => 'text'
-        };
+    if($site) {
+        for (
+            [$person->{freetext1}, $site->register_freetext1_name],
+            [$person->{freetext2}, $site->register_freetext2_name]
+        ) {
+            next unless $_->[0];
+
+            push @details, {
+                definition => $_->[1],
+                value      => $_->[0],
+                type       => 'text'
+            };
+        }
     }
 
     return {

src/frontend/components/button/_button.scss

@@ -547,3 +547,7 @@ button.close {
         color: lighten($brand-primary, 0.1);
     }
 }
+
+.btn-js-load-chronology {
+  @extend .mt-3;
+}

src/frontend/components/button/lib/component.ts

@@ -111,6 +111,12 @@ class ButtonComponent extends Component {
                     createCancelButton(el);
                 });
         });
+        map.set("btn-js-load-chronology", (el) => {
+            import(/* webpackChunkName: "load-more-chronology-button" */ "./load-more-chronology-button")
+                .then(({default: createLoadMoreChronologyButton}) => {
+                    createLoadMoreChronologyButton(el);
+                });
+        });
         ButtonComponent.staticButtonsMap = map;
     }
 

src/frontend/components/button/lib/load-more-chronology-button.test.ts

@@ -0,0 +1,18 @@
+/* eslint-disable */
+import "../../../testing/globals.definitions";
+import { describe, it, expect } from '@jest/globals';
+import {LoadMoreChronologyButton, default as createLoadMoreChronologyButton} from './load-more-chronology-button';
+
+describe('LoadMoreChronologyButton', () => {
+    it('should create a button', () => {
+        // Mock jQuery elements
+        const $button = $('<button data-record-id="123">Load More</button>');
+        const $target = $('<div class="chronology"></div>');
+        const $spinner = $('<div class="chronology_spinner" style="display:none;"></div>');
+        $('body').append($button, $target, $spinner);
+
+        const btn = createLoadMoreChronologyButton($button);
+
+        expect(btn).toBeInstanceOf(LoadMoreChronologyButton);
+    });
+});