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

Implemented: Spinner in Timezone Model for Timezone Configuration (#210) #249

Merged
merged 13 commits into from
Jan 10, 2024
Merged

Implemented: Spinner in Timezone Model for Timezone Configuration (#210) #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
3e6f569
Implemented :Spinner in Timezone Model for Timezone Configuration (#210)
Ritika-Patel08 Jan 5, 2024
aabd644
Fixed: Reverted unwanted changes
Ritika-Patel08 Jan 6, 2024
a894494
Fixed: Reverted unwanted changes
Ritika-Patel08 Jan 8, 2024
fa30057
Reverted: Removed unwanted changes such as spacing , indentation ,ext…
Ritika-Patel08 Jan 8, 2024
7db799e
Reverted: Removed unwanted changes such as spacing , indentation ,ext…
Ritika-Patel08 Jan 8, 2024
ea00179
Improved: refined the if-else logic in spinner
Ritika-Patel08 Jan 8, 2024
7d7e3e6
Improved: refined the if-else logic in spinner
Ritika-Patel08 Jan 8, 2024
9dbc25b
Improved: refined the if-else logic in spinner
Ritika-Patel08 Jan 8, 2024
65a328b
Improved: removed spaces and used self closing tag in spinner
Ritika-Patel08 Jan 8, 2024
e0ab27f
Fixed: added space
Ritika-Patel08 Jan 8, 2024
85cdac8
Improved: replaced the variable name 'loading' to 'isLoading'
Ritika-Patel08 Jan 9, 2024
7df6aca
Improved: isLoading value to false initially and changing the value a…
Ritika-Patel08 Jan 9, 2024
f93a39a
Improved: isLoading value to false initially and changing the value a…
Ritika-Patel08 Jan 9, 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
1 change: 1 addition & 0 deletions src/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
"Make sure you've reviewed the products and their counts before uploading them for review": "Make sure you've reviewed the products and their counts before uploading them for review",
"No results found": "No results found",
"No time zone found": "No time zone found",
"Fetching time zones": "Fetching time zones",
"Ok": "Ok",
"OMS": "OMS",
"OMS instance": "OMS instance",
Expand Down
15 changes: 12 additions & 3 deletions src/views/TimezoneModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,14 @@

<ion-content class="ion-padding">
<!-- Empty state -->
<div class="empty-state" v-if="filteredTimeZones.length === 0">
<p>{{ $t("No time zone found")}}</p>
<div class="empty-state" v-if="isLoading">
<ion-item lines="none">
<ion-spinner color="secondary" name="crescent" slot="start" />
{{ $t("Fetching time zones") }}
</ion-item>
</div>
<div class="empty-state" v-else-if="filteredTimeZones.length === 0">
<p>{{ $t("No time zone found") }}</p>
</div>

<!-- Timezones -->
Expand Down Expand Up @@ -86,7 +92,8 @@ export default defineComponent({
queryString: '',
filteredTimeZones: [],
timeZones: [],
timeZoneId: ''
timeZoneId: '',
isLoading: false
}
},
methods: {
Expand Down Expand Up @@ -123,6 +130,7 @@ export default defineComponent({
});
},
async getAvailableTimeZones() {
this.isLoading = true;
const resp = await UserService.getAvailableTimeZones()
if(resp.status === 200 && !hasError(resp)) {
// We are filtering valid the timeZones coming with response here
Expand All @@ -131,6 +139,7 @@ export default defineComponent({
});
this.findTimeZone();
}
this.isLoading = false;
},
async selectSearchBarText(event: any) {
const element = await event.target.getInputElement()
Expand Down
Loading