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 loading in contracts table #2801

Merged
merged 2 commits into from
Jun 4, 2024
+34 −14
Merged

Fix loading in contracts table #2801

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3776107
Style: Fix loading contracts table
0oM4R May 28, 2024
3f7a12b
Update:
0oM4R Jun 4, 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
29 changes: 15 additions & 14 deletions packages/playground/src/weblets/tf_contracts_list.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,18 @@ const nodeIDs = computed(() => {
return [...new Set(allContracts.value.map(contract => contract.details.nodeId) || [])];
});

function updateLoadingTableValue(updateAllTables: boolean, loading = true, contractType?: ContractType) {
if (updateAllTables) {
Copy link
Contributor

@xmonader xmonader May 28, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you could do a switch on contractType if your actions are going to be different, and also you don't need elseifs in your code given you do a return already in updateAllTables so you can safely start a new if or a switch

if updateAllTables {
            .... 
            return 
 }
switch contractType {
         case contractType.Name: 
                     isLoadingName.value = loading
                     break
         case 2: ...
         case 3:..
 }

isLoadingNode.value = loading;
isLoadingName.value = loading;
isLoadingRent.value = loading;
return;
} else if (contractType == ContractType.Name) isLoadingName.value = loading;
else if (contractType == ContractType.Node) isLoadingNode.value = loading;
else if (contractType == ContractType.Rent) isLoadingRent.value = loading;
return;
}

onMounted(onMount);

async function onMount() {
Expand Down Expand Up @@ -272,20 +284,11 @@ async function onMount() {
{},
);
}
isLoadingNode.value = false;
isLoadingName.value = false;
isLoadingRent.value = false;
updateLoadingTableValue(true, false);
Copy link
Contributor

@Mahmoud-Emad Mahmoud-Emad May 29, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMO. To improve code readability and maintainability, consider introducing an object instead of using named parameters.

// Define a type for the options
type ContractsLoadingOptions = {
  updateAllTables: boolean;
  loading: boolean;
  contractType?: boolean;
}

function updateContractsLoading(options: ContractsLoadingOptions) {}

// Example call
updateContractsLoading({
  updateAllTables: true,
  loading: false,
});

}

async function loadContracts(options: { page: number; itemsPerPage: number; contractType: ContractType }) {
if (options.contractType == ContractType.Node) {
isLoadingNode.value = true;
} else if (options.contractType == ContractType.Name) {
isLoadingName.value = true;
} else {
isLoadingRent.value = true;
}

updateLoadingTableValue(false, true, options.contractType);
try {
const { count, data: dataContracts } = await gridProxyClient.contracts.list({
twinId: profileManager.profile!.twinId,
Expand Down Expand Up @@ -322,9 +325,7 @@ async function loadContracts(options: { page: number; itemsPerPage: number; cont
loadingErrorMessage.value = error.message;
createCustomToast(`Error while listing contracts due: ${error.message}`, ToastType.danger, {});
} finally {
isLoadingNode.value = false;
isLoadingName.value = false;
isLoadingRent.value = false;
updateLoadingTableValue(false, false, options.contractType);
}
}

Expand Down
Loading