yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updates codebase to store tour data for a user in the user table, adds new column to store json and adds migration to create the column

Browse Source
This commit is contained in:
Shannon
2017-11-01 15:11:13 +11:00
parent e8ea7f9d29
commit 8208f8de51
15 changed files with 767 additions and 471 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour.directive.js
View File

@@ -22,14 +22,16 @@
scope.model.completeTour = function() {
unbindEvent();
tourService.completeTour(scope.model);
backdropService.close();
tourService.completeTour(scope.model).then(function() {
backdropService.close();
});
};
scope.model.disableTour = function() {
unbindEvent();
tourService.disableTour(scope.model);
backdropService.close();
tourService.disableTour(scope.model).then(function() {
backdropService.close();
});
}
function onInit() {

24
src/Umbraco.Web.UI.Client/src/common/resources/currentuser.resource.js
View File

@@ -10,6 +10,30 @@ function currentUserResource($q, $http, umbRequestHelper, umbDataFormatter) {
//the factory object returned
return {
saveTourStatus: function (tourStatus) {
if (!tourStatus) {
return angularHelper.rejectedPromise({ errorMsg: 'tourStatus cannot be empty' });
}
return umbRequestHelper.resourcePromise(
$http.post(
umbRequestHelper.getApiUrl(
"currentUserApiBaseUrl",
"PostSetUserTour"),
tourStatus),
'Failed to save tour status');
},
getTours: function () {
return umbRequestHelper.resourcePromise(
$http.get(
umbRequestHelper.getApiUrl(
"currentUserApiBaseUrl",
"GetUserTours")), 'Failed to get tours');
},
performSetInvitedUserPassword: function (newPassword) {
if (!newPassword) {

968
src/Umbraco.Web.UI.Client/src/common/services/tour.service.js
View File

File diff suppressed because it is too large Load Diff

12
src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.controller.js
View File

@@ -26,7 +26,9 @@
function oninit() {
vm.tours = tourService.getGroupedTours();
tourService.getGroupedTours().then(function(groupedTours) {
vm.tours = groupedTours;
});
// load custom help dashboard
dashboardResource.getDashboard("user-help").then(function (dashboard) {
@@ -156,9 +158,11 @@
}
evts.push(eventsService.on("appState.tour.complete", function (event, tour) {
vm.tours = tourService.getGroupedTours();
openTourGroup(tour.alias);
getTourGroupCompletedPercentage();
tourService.getGroupedTours().then(function(groupedTours) {
vm.tours = groupedTours;
openTourGroup(tour.alias);
getTourGroupCompletedPercentage();
});
}));
$scope.$on('$destroy', function () {

21
src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js
View File

@@ -30,20 +30,17 @@ function startUpDynamicContentController($timeout, dashboardResource, assetsServ
function onInit() {
// load tours
vm.tours = tourService.getGroupedTours();
tourService.getGroupedTours().then(function(groupedTours) {
vm.tours = groupedTours;
});
// get list of completed tours and disabled tours
var completedTours = tourService.getCompletedTours();
var disabledTours = tourService.getDisabledTours();
// get intro tour
var introTour = tourService.getTourByAlias("umbIntroIntroduction");
// start intro tour if it hasn't been completed or disabled
if(completedTours.indexOf(introTour.alias) === -1 && disabledTours.indexOf(introTour.alias) === -1) {
tourService.startTour(introTour);
}
tourService.getTourByAlias("umbIntroIntroduction").then(function (introTour) {
// start intro tour if it hasn't been completed or disabled
if (introTour.disabled !== true && introTour.completed !== true) {
tourService.startTour(introTour);
}
});
}
function startTour(tour) {