patch of appview/pages,appview/issues: improve pagnation ui on issues · round #0 · pull #838 · tangled.org/core

appview/issues/issues.go

···

       804
        
       		return

     

       805
        
       	}

     

       806
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       807
        
       	keyword := params.Get("q")

     

       808
        
       

     

       809
        
       	var issues []models.Issue

     
···

       820
        
       			return

     

       821
        
       		}

     

       822
        
       		l.Debug("searched issues with indexer", "count", len(res.Hits))

     

       0
        
       
     

       823
        
       

     

       824
        
       		issues, err = db.GetIssues(

     

       825
        
       			rp.db,

     
···

       869
        
       		LoggedInUser:    rp.oauth.GetUser(r),

     

       870
        
       		RepoInfo:        f.RepoInfo(user),

     

       871
        
       		Issues:          issues,

     

       0
        
       
     

       872
        
       		LabelDefs:       defs,

     

       873
        
       		FilteringByOpen: isOpen,

     

       874
        
       		FilterQuery:     keyword,

···

       804
        
       		return

     

       805
        
       	}

     

       806
        
       

     

       807
       +
       	totalIssues := 0

     

       808
       +
       	if isOpen {

     

       809
       +
       		totalIssues = f.RepoStats.IssueCount.Open

     

       810
       +
       	} else {

     

       811
       +
       		totalIssues = f.RepoStats.IssueCount.Closed

     

       812
       +
       	}

     

       813
       +
       

     

       814
        
       	keyword := params.Get("q")

     

       815
        
       

     

       816
        
       	var issues []models.Issue

     
···

       827
        
       			return

     

       828
        
       		}

     

       829
        
       		l.Debug("searched issues with indexer", "count", len(res.Hits))

     

       830
       +
       		totalIssues = int(res.Total)

     

       831
        
       

     

       832
        
       		issues, err = db.GetIssues(

     

       833
        
       			rp.db,

     
···

       877
        
       		LoggedInUser:    rp.oauth.GetUser(r),

     

       878
        
       		RepoInfo:        f.RepoInfo(user),

     

       879
        
       		Issues:          issues,

     

       880
       +
       		IssueCount:      totalIssues,

     

       881
        
       		LabelDefs:       defs,

     

       882
        
       		FilteringByOpen: isOpen,

     

       883
        
       		FilterQuery:     keyword,

appview/pages/funcmap.go

···

       100
        
       		"sub": func(a, b int) int {

     

       101
        
       			return a - b

     

       102
        
       		},

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       103
        
       		"f64": func(a int) float64 {

     

       104
        
       			return float64(a)

     

       105
        
       		},

···

       100
        
       		"sub": func(a, b int) int {

     

       101
        
       			return a - b

     

       102
        
       		},

     

       103
       +
       		"mul": func (a, b int) int {

     

       104
       +
       			return a * b

     

       105
       +
       		},

     

       106
       +
       		"div": func (a, b int) int {

     

       107
       +
       			return a / b

     

       108
       +
       		},

     

       109
       +
       		"mod": func(a, b int) int {

     

       110
       +
       			return a % b

     

       111
       +
       		},

     

       112
        
       		"f64": func(a int) float64 {

     

       113
        
       			return float64(a)

     

       114
        
       		},

appview/pages/pages.go

···

       908
        
       	RepoInfo        repoinfo.RepoInfo

     

       909
        
       	Active          string

     

       910
        
       	Issues          []models.Issue

     

       0
        
       
     

       911
        
       	LabelDefs       map[string]*models.LabelDefinition

     

       912
        
       	Page            pagination.Page

     

       913
        
       	FilteringByOpen bool

···

       908
        
       	RepoInfo        repoinfo.RepoInfo

     

       909
        
       	Active          string

     

       910
        
       	Issues          []models.Issue

     

       911
       +
       	IssueCount			int

     

       912
        
       	LabelDefs       map[string]*models.LabelDefinition

     

       913
        
       	Page            pagination.Page

     

       914
        
       	FilteringByOpen bool

+95 -26

appview/pages/templates/repo/issues/issues.html

···

       70
        
         <div class="mt-2">

     

       71
        
           {{ template "repo/issues/fragments/issueListing" (dict "Issues" .Issues "RepoPrefix" .RepoInfo.FullName "LabelDefs" .LabelDefs) }}

     

       72
        
         </div>

     

       73
       -
         {{ block "pagination" . }} {{ end }}

     

       0
        
       
     

       0
        
       
     

       74
        
       {{ end }}

     

       75
        
       

     

       76
        
       {{ define "pagination" }}

     

       77
       -
       <div class="flex justify-end mt-4 gap-2">

     

       78
       -
           {{ $currentState := "closed" }}

     

       79
       -
           {{ if .FilteringByOpen }}

     

       80
       -
             {{ $currentState = "open" }}

     

       81
       -
           {{ end }}

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       82
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       83
        
           {{ if gt .Page.Offset 0 }}

     

       84
       -
              {{ $prev := .Page.Previous }}

     

       85
       -
               <a

     

       86
       -
                   class="btn flex items-center gap-2 no-underline hover:no-underline dark:text-white dark:hover:bg-gray-700"

     

       87
       -
                   hx-boost="true"

     

       88
       -
                   href = "/{{ $.RepoInfo.FullName }}/issues?state={{ $currentState }}&q={{ .FilterQuery }}&offset={{ $prev.Offset }}&limit={{ $prev.Limit }}"

     

       89
       -
               >

     

       90
       -
                   {{ i "chevron-left" "w-4 h-4" }}

     

       91
       -
                   previous

     

       92
       -
               </a>

     

       93
       -
           {{ else }}

     

       94
       -
               <div></div>

     

       95
        
           {{ end }}

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       96
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       97
        
           {{ if eq (len .Issues) .Page.Limit }}

     

       98
       -
              {{ $next := .Page.Next }}

     

       99
       -
               <a

     

       100
       -
                   class="btn flex items-center gap-2 no-underline hover:no-underline dark:text-white dark:hover:bg-gray-700"

     

       101
       -
                   hx-boost="true"

     

       102
       -
                   href = "/{{ $.RepoInfo.FullName }}/issues?state={{ $currentState }}&q={{ .FilterQuery }}&offset={{ $next.Offset }}&limit={{ $next.Limit }}"

     

       103
       -
               >

     

       104
       -
                   next

     

       105
       -
                   {{ i "chevron-right" "w-4 h-4" }}

     

       106
       -
               </a>

     

       107
        
           {{ end }}

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       108
        
       </div>

     

       109
        
       {{ end }}

···

       70
        
         <div class="mt-2">

     

       71
        
           {{ template "repo/issues/fragments/issueListing" (dict "Issues" .Issues "RepoPrefix" .RepoInfo.FullName "LabelDefs" .LabelDefs) }}

     

       72
        
         </div>

     

       73
       +
         {{if gt .IssueCount .Page.Limit }} 

     

       74
       +
           {{ block "pagination" . }} {{ end }} 

     

       75
       +
         {{ end }}

     

       76
        
       {{ end }}

     

       77
        
       

     

       78
        
       {{ define "pagination" }}

     

       79
       +
       <div class="flex justify-center items-center mt-4 gap-2">

     

       80
       +
         {{ $currentState := "closed" }}

     

       81
       +
         {{ if .FilteringByOpen }}

     

       82
       +
           {{ $currentState = "open" }}

     

       83
       +
         {{ end }}

     

       84
       +
       

     

       85
       +
         {{ $prev := .Page.Previous.Offset }}

     

       86
       +
         {{ $next := .Page.Next.Offset }}

     

       87
       +
         {{ $lastPage := sub .IssueCount (mod .IssueCount .Page.Limit) }}

     

       88
        
       

     

       89
       +
         <a

     

       90
       +
           class="

     

       91
       +
             btn flex items-center gap-2 no-underline hover:no-underline 

     

       92
       +
             dark:text-white dark:hover:bg-gray-700

     

       93
       +
             {{ if le .Page.Offset 0 }}

     

       94
       +
               cursor-not-allowed opacity-50

     

       95
       +
             {{ end }}

     

       96
       +
           "

     

       97
        
           {{ if gt .Page.Offset 0 }}

     

       98
       +
             hx-boost="true"

     

       99
       +
             href = "/{{ $.RepoInfo.FullName }}/issues?state={{ $currentState }}&q={{ .FilterQuery }}&offset={{ $prev }}&limit={{ .Page.Limit }}"

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       100
        
           {{ end }}

     

       101
       +
         >

     

       102
       +
           {{ i "chevron-left" "w-4 h-4" }}

     

       103
       +
           previous

     

       104
       +
         </a>

     

       105
       +
       

     

       106
       +
         <!-- dont show first page if current page is first page -->

     

       107
       +
         {{ if gt .Page.Offset 0 }}

     

       108
       +
           <a

     

       109
       +
             hx-boost="true"

     

       110
       +
             href = "/{{ $.RepoInfo.FullName }}/issues?state={{ $currentState }}&q={{ .FilterQuery }}&offset=0&limit={{ .Page.Limit }}"

     

       111
       +
           >

     

       112
       +
             1

     

       113
       +
           </a>

     

       114
       +
         {{ end }}

     

       115
       +
       

     

       116
       +
         <!-- if previous page is not first or second page (prev > limit) -->

     

       117
       +
         {{ if gt $prev .Page.Limit }}

     

       118
       +
           <span>...</span>

     

       119
       +
         {{ end }}

     

       120
       +
       

     

       121
       +
         <!-- if previous page is not the first page -->

     

       122
       +
         {{ if gt $prev 0 }}

     

       123
       +
           <a

     

       124
       +
             hx-boost="true"

     

       125
       +
             href = "/{{ $.RepoInfo.FullName }}/issues?state={{ $currentState }}&q={{ .FilterQuery }}&offset={{ $prev }}&limit={{ .Page.Limit }}"

     

       126
       +
           >

     

       127
       +
             {{ add (div $prev .Page.Limit) 1 }}

     

       128
       +
           </a>

     

       129
       +
         {{ end }}

     

       130
       +
       

     

       131
       +
         <!-- current page. this is always visible -->

     

       132
       +
         <span class="font-bold">

     

       133
       +
           {{ add (div .Page.Offset .Page.Limit) 1 }}

     

       134
       +
         </span>

     

       135
       +
       

     

       136
       +
         <!-- if next page is not last page -->

     

       137
       +
         {{ if lt $next $lastPage }}

     

       138
       +
           <a

     

       139
       +
             hx-boost="true"

     

       140
       +
             href = "/{{ $.RepoInfo.FullName }}/issues?state={{ $currentState }}&q={{ .FilterQuery }}&offset={{ $next }}&limit={{ .Page.Limit }}"

     

       141
       +
           >

     

       142
       +
             {{ add (div $next .Page.Limit) 1 }}

     

       143
       +
           </a>

     

       144
       +
         {{ end }}

     

       145
       +
       

     

       146
       +
         <!-- if next page is not second last or last page (next < issues - 2 * limit) -->

     

       147
       +
         {{ if lt ($next) (sub .IssueCount (mul (2) .Page.Limit)) }}

     

       148
       +
           <span>...</span>

     

       149
       +
         {{ end }}

     

       150
        
       

     

       151
       +
         <!-- if its not the last page -->

     

       152
       +
         {{ if lt .Page.Offset $lastPage }} 

     

       153
       +
           <a

     

       154
       +
             hx-boost="true"

     

       155
       +
             href = "/{{ $.RepoInfo.FullName }}/issues?state={{ $currentState }}&q={{ .FilterQuery }}&offset={{ $lastPage }}&limit={{ .Page.Limit }}"

     

       156
       +
           >

     

       157
       +
             {{ add (div $lastPage .Page.Limit) 1 }}

     

       158
       +
           </a>

     

       159
       +
         {{ end }}

     

       160
       +
       

     

       161
       +
         <a

     

       162
       +
           class="

     

       163
       +
             btn flex items-center gap-2 no-underline hover:no-underline 

     

       164
       +
             dark:text-white dark:hover:bg-gray-700

     

       165
       +
             {{ if ne (len .Issues) .Page.Limit }}

     

       166
       +
                 cursor-not-allowed opacity-50

     

       167
       +
             {{ end }}

     

       168
       +
           "

     

       169
        
           {{ if eq (len .Issues) .Page.Limit }}

     

       170
       +
             hx-boost="true"

     

       171
       +
             href="/{{ $.RepoInfo.FullName }}/issues?state={{ $currentState }}&q={{ .FilterQuery }}&offset={{ $next }}&limit={{ .Page.Limit }}"

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       172
        
           {{ end }}

     

       173
       +
         >

     

       174
       +
           next

     

       175
       +
           {{ i "chevron-right" "w-4 h-4" }}

     

       176
       +
         </a>

     

       177
        
       </div>

     

       178
        
       {{ end }}