Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-06 06:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Include folder count and total account in apps meta

Browse source
This commit is contained in:
navaneeth 2021-05-19 15:06:01 +05:30
parent e6198809ba
commit 6ade470433
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/controllers/apps_controller.rb
View file

@ -20,7 +20,8 @@ class AppsController < ApplicationController
@meta = {
total_pages: @apps.total_pages,
count: @scope.count,
folder_count: @scope.count,
total_count: App.count,
current_page: @apps.current_page
}
end

12
frontend/src/HomePage/HomePage.jsx
View file

@ -179,7 +179,7 @@ class HomePage extends React.Component {
<br />
<Folders
foldersLoading={this.state.foldersLoading}
totalCount={this.state.meta.count}
totalCount={this.state.meta.total_count}
folders={this.state.folders}
currentFolder={currentFolder}
folderChanged={this.folderChanged}
@ -187,7 +187,7 @@ class HomePage extends React.Component {
</div>
<div className="col-md-9">
{meta.count > 0 && (
{meta.folder_count > 0 && (
<div className="w-100 mb-5">
<div className="row align-items-center">
<div className="col">
@ -243,7 +243,11 @@ class HomePage extends React.Component {
<span class="badge bg-green-lt">Edit</span>
</Link>
<span className="badge bg-blue-lt mx-2">
<img src="https://www.svgrepo.com/show/12267/menu.svg" width="12" height="12" />
</span>
</td>
</tr>))
}
@ -252,7 +256,7 @@ class HomePage extends React.Component {
</div>
<Pagination
currentPage={meta.current_page}
count={meta.count}
count={meta.folder_count}
totalPages={meta.total_pages}
pageChanged={this.pageChanged}
/>