Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Display Care Loading Icon Instead of "No Assets Found" on Asset Tab Revisit on advanced filter #9205

Closed
wants to merge 8 commits into from
Closed

Fix: Display Care Loading Icon Instead of "No Assets Found" on Asset Tab Revisit on advanced filter #9205

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fae3d3d
corrected loading message
Mahendar0701 Nov 25, 2024
664e2d2
updated loading logic
Mahendar0701 Nov 26, 2024
90dc196
Merge branch 'develop' into relevant-loading-icon-in-assetspage
Mahendar0701 Nov 26, 2024
8d8c064
Merge branch 'develop' into relevant-loading-icon-in-assetspage
Mahendar0701 Nov 26, 2024
acd9103
updated loading state without using delay
Mahendar0701 Nov 27, 2024
c07cb3a
Merge branch 'develop' into relevant-loading-icon-in-assetspage
Mahendar0701 Nov 27, 2024
d54f99b
changes added
Mahendar0701 Nov 27, 2024
7f15aea
Merge branch 'develop' into relevant-loading-icon-in-assetspage
Mahendar0701 Nov 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions src/components/Assets/AssetsList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ const AssetsList = () => {
const [status, setStatus] = useState<string>();
const [asset_class, setAssetClass] = useState<string>();
const [importAssetModalOpen, setImportAssetModalOpen] = useState(false);
const assetsExist = assets.length > 0 && Object.keys(assets[0]).length > 0;
const [showFacilityDialog, setShowFacilityDialog] = useState(false);
const [selectedFacility, setSelectedFacility] = useState<FacilityModel>({
name: "",
Expand All @@ -70,7 +69,11 @@ const AssetsList = () => {
qParams.warranty_amc_end_of_validity_after || "",
};

const { refetch: assetsFetch, loading } = useQuery(routes.listAssets, {
const {
refetch: assetsFetch,
loading,
data,
} = useQuery(routes.listAssets, {
query: params,
onResponse: ({ res, data }) => {
if (res?.status === 200 && data) {
Expand Down Expand Up @@ -210,13 +213,13 @@ const AssetsList = () => {
);

let manageAssets = null;
if (loading) {
if (loading || !data) {
manageAssets = (
<div className="col-span-3 w-full py-8 text-center">
<Loading />
</div>
);
rithviknishad marked this conversation as resolved.
Show resolved Hide resolved
} else if (assetsExist) {
} else if (data.count) {
manageAssets = (
<div className="grid grid-cols-1 gap-2 md:-mx-8 md:grid-cols-2 lg:grid-cols-3">
{assets.map((asset: AssetData) => (
Expand Down Expand Up @@ -371,7 +374,7 @@ const AssetsList = () => {
<CountBlock
text="Total Assets"
count={totalCount}
loading={loading}
loading={loading || !data}
icon="l-monitor-heart-rate"
className="flex-1"
/>
Expand Down
Loading