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

Fixed: case to not display the previous created/selected user information on creating new user by adding a loader(#214) #216

Merged
merged 4 commits into from
Apr 19, 2024
Merged

Fixed: case to not display the previous created/selected user information on creating new user by adding a loader(#214) #216

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d043e88
FIxed: new user info will show after loader(#214)
R-Sourabh Apr 18, 2024
60e2b2d
Improved: Clear selected user state and navigate to the create user p…
R-Sourabh Apr 19, 2024
5b29e92
Update Users.vue
R-Sourabh Apr 19, 2024
28fc9b1
Merge remote-tracking branch 'upstream/main' into #214-delay-user
R-Sourabh Apr 19, 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
3 changes: 3 additions & 0 deletions src/views/UserConfirmation.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
mailOutline
} from 'ionicons/icons';
import { translate } from "@hotwax/dxp-components";
import emitter from "@/event-bus";

export default defineComponent({
name: "UserConfirmation",
Expand All @@ -95,7 +96,9 @@
},
props: ['partyId'],
async ionViewWillEnter() {
emitter.emit('presentLoader')
await this.store.dispatch("user/getSelectedUserDetails", { partyId: this.partyId });
emitter.emit('dismissLoader')
},
methods: {
async quickSetup() {
Expand Down
9 changes: 7 additions & 2 deletions src/views/Users.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
</div>

<ion-fab vertical="bottom" horizontal="end" slot="fixed">
<ion-fab-button :disabled="!hasPermission(Actions.APP_USER_CREATE)" @click="router.push('/create-user')">
<ion-fab-button :disabled="!hasPermission(Actions.APP_USER_CREATE)" @click="handleNewUser()">
<ion-icon :icon="addOutline" />
</ion-fab-button>
</ion-fab>
Expand Down Expand Up @@ -206,7 +206,8 @@ export default defineComponent({
securityGroups: 'util/getSecurityGroups',
query: 'user/getQuery',
isScrollable: "user/isScrollable",
userProfile: 'user/getUserProfile'
userProfile: 'user/getUserProfile',
selectedUser: 'user/getSelectedUser'
R-Sourabh marked this conversation as resolved.
Show resolved Hide resolved
})
},
data() {
Expand All @@ -221,6 +222,10 @@ export default defineComponent({
await this.store.dispatch('util/getSecurityGroups')
},
methods: {
handleNewUser(){
R-Sourabh marked this conversation as resolved.
Show resolved Hide resolved
this.selectedUser = '';
R-Sourabh marked this conversation as resolved.
Show resolved Hide resolved
this.router.push('/create-user');
},
getDate(date: any) {
return DateTime.fromMillis(date).toFormat('dd LLL yyyy')
},
Expand Down