Release 10.aug.2016 1

App_Start/AutoMapperBootstrapper.cs

@@ -3,6 +3,7 @@
 using System.Linq;
 using AutoMapper;
 using Data.Entities;
+using Data.States;
 using Fr8.Infrastructure.Data.DataTransferObjects;
 using Hub.Interfaces;
 using HubWeb.ViewModels;
@@ -20,6 +21,7 @@ public AutoMapperBootStrapper(ITerminal terminal, IActivityTemplate activityTemp
             _terminal = terminal;
             _activityTemplate = activityTemplate;
         }
+
 
         public void ConfigureAutoMapper()
         {
@@ -28,7 +30,7 @@ public void ConfigureAutoMapper()
                 .ForMember(a => a.Description, opts => opts.ResolveUsing(ad => ad.Description))
                 .ForMember(a => a.LastUpdated, opts => opts.ResolveUsing(ad => ad.LastUpdated))
                 .ForMember(a => a.Name, opts => opts.ResolveUsing(ad => ad.Name))
-                .ForMember(a => a.PlanState, opts => opts.ResolveUsing(ad => ad.PlanState))
+                .ForMember(a => a.PlanState, opts => opts.ResolveUsing(ad => PlanState.IntToString(ad.PlanState)))
                 .ForMember(a => a.StartingSubPlanId, opts => opts.ResolveUsing(ad => ad.StartingSubPlanId))
                 .ForMember(a => a.Tag, opts => opts.ResolveUsing(ad => ad.Tag))
                 .ForMember(a => a.Visibility, opts => opts.ResolveUsing(ad => new PlanVisibilityDTO() { Hidden = ad.Visibility.BooleanValue() }));
@@ -38,15 +40,14 @@ public void ConfigureAutoMapper()
                 .ForMember(a => a.Description, opts => opts.ResolveUsing(ad => ad.Description))
                 .ForMember(a => a.LastUpdated, opts => opts.ResolveUsing(ad => ad.LastUpdated))
                 .ForMember(a => a.Name, opts => opts.ResolveUsing(ad => ad.Name))
-                .ForMember(a => a.PlanState, opts => opts.ResolveUsing(ad => ad.PlanState))
+                .ForMember(a => a.PlanState, opts => opts.ResolveUsing(ad => PlanState.StringToInt(ad.PlanState)))
                 .ForMember(a => a.StartingSubPlanId, opts => opts.ResolveUsing(ad => ad.StartingSubPlanId))
                 .ForMember(a => a.Tag, opts => opts.ResolveUsing(ad => ad.Tag))
                 .ForMember(a => a.Visibility, opts => opts.ResolveUsing(ad => ad.Visibility?.PlanVisibilityValue()));
 
             Mapper.CreateMap<ActivityDO, ActivityDTO>().ForMember(a => a.Id, opts => opts.ResolveUsing(ad => ad.Id))
                 .ForMember(a => a.RootPlanNodeId, opts => opts.ResolveUsing(ad => ad.RootPlanNodeId))
                 .ForMember(a => a.ParentPlanNodeId, opts => opts.ResolveUsing(ad => ad.ParentPlanNodeId))
-                .ForMember(a => a.CurrentView, opts => opts.ResolveUsing(ad => ad.currentView))
                 .ForMember(a => a.ChildrenActivities, opts => opts.ResolveUsing(ad => ad.ChildNodes.OfType<ActivityDO>().OrderBy(da => da.Ordering)))
                 .ForMember(a => a.ActivityTemplate, opts => opts.ResolveUsing(GetActivityTemplate))
                 .ForMember(a => a.AuthToken, opts => opts.ResolveUsing(ad => ad.AuthorizationToken));
@@ -57,7 +58,6 @@ public void ConfigureAutoMapper()
                 //.ForMember(a => a.ActivityTemplate, opts => opts.Ignore())
                 .ForMember(a => a.ActivityTemplateId, opts => opts.ResolveUsing(GetActivityTemplateId))
                 //.ForMember(a => a.CrateStorage, opts => opts.ResolveUsing(ad => Newtonsoft.Json.JsonConvert.SerializeObject(ad.CrateStorage)))
-                .ForMember(a => a.currentView, opts => opts.ResolveUsing(ad => ad.CurrentView))
                 .ForMember(a => a.ChildNodes, opts => opts.ResolveUsing(ad => MapActivities(ad.ChildrenActivities)))
                 .ForMember(a => a.AuthorizationTokenId, opts => opts.ResolveUsing(ad => ad.AuthToken != null && ad.AuthToken.Id != null ? new Guid(ad.AuthToken.Id) : (Guid?)null));
 

App_Start/RouteConfig.cs

@@ -29,6 +29,12 @@ public static void RegisterRoutes(RouteCollection routes)
                 defaults: new { controller = "Redirect", action = "TwilioSMS" }
             );
 
+            routes.MapRoute(
+                name: "Plan_Directory",
+                url: "plan_directory",
+                defaults: new { controller = "PlanDirectory", action = "Index" }
+            );
+
             routes.MapRoute(
                 name: "Default",
                 url: "{controller}/{action}/{id}",

App_Start/StartupMigration.cs

@@ -4,6 +4,13 @@
 using Fr8.Infrastructure.Utilities;
 using Newtonsoft.Json;
 using System.Linq;
+using AutoMapper;
+using Data.Repositories.Encryption;
+using Fr8.Infrastructure.Data.Control;
+using Fr8.Infrastructure.Data.Crates;
+using Fr8.Infrastructure.Data.DataTransferObjects;
+using Fr8.Infrastructure.Data.Managers;
+using Fr8.Infrastructure.Data.Manifests;
 
 namespace HubWeb.App_Start
 {
@@ -13,42 +20,59 @@ public static void CreateSystemUser()
         {
             using (var uow = ObjectFactory.GetInstance<IUnitOfWork>())
             {
-                var configRepository  = ObjectFactory.GetInstance<IConfigRepository>();
+                var configRepository = ObjectFactory.GetInstance<IConfigRepository>();
                 string userEmail = configRepository.Get("SystemUserEmail");
                 string curPassword = configRepository.Get("SystemUserPassword");
 
                 var user = uow.UserRepository.GetOrCreateUser(userEmail);
                 uow.UserRepository.UpdateUserCredentials(userEmail, userEmail, curPassword);
                 uow.AspNetUserRolesRepository.AssignRoleToUser(Roles.Admin, user.Id);
                 user.TestAccount = false;
-                
+
                 uow.SaveChanges();
             }
         }
 
-        //Prior to FR-3683 Salesforce refresh tokens were stored in nonsecure part of database
-        //This method is intended to save them into key vault
-        //This method is not a part of Seed method because at that point of time key vault is not yet configured
-        //TODO: delete this method after this is deployed to prod
-        public static void MoveSalesforceRefreshTokensIntoKeyVault()
+        //TODO: this method is a one-time update of transitions inside ContainerTransition control and should be removed after it is deployed to prod
+        public static void UpdateTransitionNames()
         {
             using (var uow = ObjectFactory.GetInstance<IUnitOfWork>())
             {
-                var terminalId = uow.TerminalRepository.GetQuery().Where(x => x.Name == "terminalSalesforce").Select(x => x.Id).FirstOrDefault();
-                if (terminalId == 0)
-                {
-                    return;
-                }
-                var tokens = uow.AuthorizationTokenRepository.GetPublicDataQuery().Where(x => x.TerminalID == terminalId && x.AdditionalAttributes.StartsWith("refresh_token"));
-                foreach (var token in tokens)
+                var encryptionService = ObjectFactory.GetInstance<IEncryptionService>();
+                foreach (var activity in uow.PlanRepository
+                    .GetActivityQueryUncached()
+                    .Where(x => x.ActivityTemplate.Name == "Make_a_Decision" && x.ActivityTemplate.Version == "1"))
                 {
-                    var actualToken = uow.AuthorizationTokenRepository.FindTokenById(token.Id);
-                    var refreshTokenFirstIndex = actualToken.AdditionalAttributes.IndexOf('=') + 1;
-                    var refreshTokenLastIndex = actualToken.AdditionalAttributes.IndexOf(';');
-                    actualToken.Token = JsonConvert.SerializeObject(new { AccessToken = actualToken.Token, RefreshToken = actualToken.AdditionalAttributes.Substring(refreshTokenFirstIndex, refreshTokenLastIndex - refreshTokenFirstIndex) });
-                    actualToken.AdditionalAttributes = actualToken.AdditionalAttributes.Substring(refreshTokenLastIndex + 1);
+
+                    var storage = activity.EncryptedCrateStorage == null || activity.EncryptedCrateStorage.Length == 0
+                        ? activity.CrateStorage
+                        : encryptionService.DecryptString(activity.Fr8AccountId, activity.EncryptedCrateStorage);
+                    if (string.IsNullOrEmpty(storage))
+                    {
+                        continue;
+                    }
+                    var crateStorageDto = JsonConvert.DeserializeObject<CrateStorageDTO>(storage);
+                    var crateStorage = CrateStorageSerializer.Default.ConvertFromDto(crateStorageDto);
+                    var controls = crateStorage.FirstCrateOrDefault<StandardConfigurationControlsCM>()?.Content;
+                    if (controls == null)
+                    {
+                        continue;
+                    }
+                    var transitionList = controls.Controls.OfType<ContainerTransition>().First();
+                    for (var i = 0; i < transitionList.Transitions.Count; i++)
+                    {
+                        var transition = transitionList.Transitions[i];
+                        transition.Name = $"transition_{i}";
+                    }
+                    crateStorageDto = CrateStorageSerializer.Default.ConvertToDto(crateStorage);
+                    storage = JsonConvert.SerializeObject(crateStorageDto, Formatting.Indented);
+                    if (!string.IsNullOrEmpty(activity.CrateStorage))
+                    {
+                        activity.CrateStorage = storage;
+                    }
+                    activity.EncryptedCrateStorage = encryptionService.EncryptData(activity.Fr8AccountId, storage);
+                    uow.SaveChanges();
                 }
-                uow.SaveChanges();
             }
         }
     }

App_Start/SwaggerConfig.cs

@@ -4,8 +4,8 @@
 using HubWeb;
 using Swashbuckle.Application;
 using System.Linq;
+using Fr8.Infrastructure.Documentation.Swagger;
 using HubWeb.Documentation.Swagger;
-using HubWeb.Documentation.Swagger.OperationFilters;
 using Swashbuckle.Swagger;
 
 [assembly: PreApplicationStartMethod(typeof(SwaggerConfig), "Register")]
@@ -180,6 +180,7 @@ public static void Register()
                         //Removing duplicates filter
                         c.DocumentFilter<RemoveDuplicatesDocumentFilter>();
                         c.DocumentFilter<AddDefaultValuesDocumentFilter>();
+                        c.DocumentFilter<AddHubDefaultValuesDocumentFilter>();
 
                         // In contrast to WebApi, Swagger 2.0 does not include the query string component when mapping a URL
                         // to an action. As a result, Swashbuckle will raise an exception if it encounters multiple actions

Services/PlanDirectory/CategoryPages/basecamp2.html → CategoryPages/asana.html

@@ -20,9 +20,9 @@
         </div>
     </div>
     <div class="container">        
-        <p style="font-size: 30px">Plan Directory - basecamp2.html</p>
+        <p style="font-size: 30px">Plan Directory - asana.html</p>
         <div class="icons">
-						<img class="web-service-icon" src="../Content/icons/web_services/basecamp2-icon-64x64.png"/>		
+						<img class="web-service-icon" src="../Content/icons/web_services/asana-icon-64x64.png"/>		
 
 		        </div>
         <br/>
@@ -40,9 +40,9 @@
                 <tbody>
                                         <tr>
                         <th scope="row">1</th>
-                        <td>Basecamp</td>
-                        <td>Basecamp</td>
-                        <td><a href="http://localhost:30643/dashboard/plans/1568cb57-58ff-4258-a412-dff852565d9f/builder?viewMode=plan">Create</a></td>
+                        <td>UgaChaga</td>
+                        <td>UgaChaga</td>
+                        <td><a href="http://localhost:30643/dashboard/plans/a4bb1bab-fba7-494f-b838-4b0390a1b577/builder?viewMode=plan">Create</a></td>
                     </tr>                   
 
                 </tbody>

Config/HubWeb/Settings.config.readme

@@ -32,6 +32,10 @@ exclude them from .gitignore.
   <!-- Plan Directory connection. This secret must match the secret specified 
   in the PlanDirectory configuration file.-->
   <add key="PlanDirectorySecret" value="" />
+
+  <add key="AzureSearchServiceName" value="" />
+  <add key="AzureSearchApiKey" value="" />
+  <add key="AzureSearchIndexName" value="" />
 
   <!-- System user account -->
   <add key="SystemUserEmail" value="[email protected]" />

Content/css/dockyard.css

@@ -111,6 +111,14 @@
     padding: 5px 0px 0px 0px
 }
 
+.black-radio .md-off , .black-radio.md-checked .md-off{
+    border-color: black !important;
+}
+//checked
+.black-radio .md-on, .black-radio.md-checked .md-on{
+    background-color: black !important;
+}
+
 .design-header-title-editField {
     display: none;
     font-size: 22px;
@@ -484,10 +492,21 @@ div.action-header {
     right: -66px;
 }
 
+.jumptarget{
+    display: inline-block; 
+    height: 50px; 
+    margin-top: 84px; 
+    max-width:500px;
+}
+
 .action-add-button-link {
     padding: 25px 0 15px 0;
 }
 
+.action-add-button-disabled {
+    background: #dcdcdc !important;
+}
+
 .action-add-button {
     background: #fCfCfC;
     border-radius: 50%;
@@ -1541,6 +1560,16 @@ md-radio-button .md-on{
     border-radius:50% !important;
 }
 
+
+
+.black-radio.md-checked .md-off, .black-radio .md-off {
+    border-color: rgba(0,0,0,0.87) !important;
+}
+.black-radio.md-checked .md-on, .black-radio .md-on{
+    background-color: rgba(0,0,0,0.87) !important;
+}
+
+
 md-checkbox.md-checked.green .md-icon {
  background-color: rgb(38, 166, 154);
 }

Services/PlanDirectory/Content/css/plan-directory.css → Content/css/plan-directory.css

@@ -108,6 +108,7 @@ header#site-header:after {
 
 /*Search Bar Container*/
 .search-bar-container {
+    width: 100%;
     text-align: center;
     display: inline-block;
     padding: 0 1em;
@@ -138,6 +139,7 @@ header#site-header:after {
     text-align: center;
     padding: 0 1em;
     display: inline-block;
+    width: 100%;
 }
 
 .result-container .base-block-white {

Content/templates/metronic/assets/admin/layout3/scripts/layout.js

@@ -98,9 +98,9 @@ var Layout = function () {
         });
 
         // hold mega menu content open on click/tap. 
-        $(document).on('click', '.mega-menu-dropdown .dropdown-menu, .classic-menu-dropdown .dropdown-menu', function (e) {
-            e.stopPropagation();
-        });
+        //$(document).on('click', '.mega-menu-dropdown .dropdown-menu, .classic-menu-dropdown .dropdown-menu', function (e) {
+        //    e.stopPropagation();
+        //});
 
         // handle fixed mega menu(minimized) 
         $(window).scroll(function() {                

Controllers/Api/ActivitiesController.cs

@@ -52,7 +52,7 @@ public async Task<IHttpActionResult> Create(Guid activityTemplateId, string labe
         {
             using (var uow = _uowFactory.Create())
             {
-                if (parentNodeId != null && _planService.GetPlanState(uow, parentNodeId.Value) == PlanState.Running)
+                if (parentNodeId != null && _planService.IsPlanActiveOrExecuting(parentNodeId.Value))
                 {
                     return new LockedHttpActionResult();
                 }
@@ -77,12 +77,11 @@ public async Task<IHttpActionResult> Create(Guid activityTemplateId, string labe
         [SwaggerResponse((HttpStatusCode)423, "Specified plan is in running state and 'force' flag is not set so activity can't be configured")]
         public async Task<IHttpActionResult> Configure(ActivityDTO curActionDesignDTO, [FromUri]bool force = false)
         {
-            curActionDesignDTO.CurrentView = null;
             ActivityDO curActivityDO = Mapper.Map<ActivityDO>(curActionDesignDTO);
             var userId = User.Identity.GetUserId();
             using (var uow = _uowFactory.Create())
             {
-                if (_planService.GetPlanState(uow, curActionDesignDTO.Id) == PlanState.Running && !force)
+                if (_planService.IsPlanActiveOrExecuting(curActionDesignDTO.Id) && !force)
                 {
                     return new LockedHttpActionResult();
                 }
@@ -130,12 +129,9 @@ public IHttpActionResult Get(Guid id)
         [SwaggerResponseRemoveDefaults]
         public async Task<IHttpActionResult> Delete([FromUri] Guid id, [FromUri(Name = "delete_child_nodes")] bool deleteChildNodes = false)
         {
-            using (var uow = _uowFactory.Create())
+            if (_planService.IsPlanActiveOrExecuting(id))
             {
-                if (_planService.GetPlanState(uow, id) == PlanState.Running)
-                {
-                    return new LockedHttpActionResult();
-                }
+                return new LockedHttpActionResult();
             }
             if (deleteChildNodes)
             {
@@ -162,7 +158,7 @@ public async Task<IHttpActionResult> Save(ActivityDTO curActionDTO, [FromUri]boo
         {
             using (var uow = _uowFactory.Create())
             {
-                if (_planService.GetPlanState(uow, curActionDTO.Id) == PlanState.Running && !force)
+                if (_planService.IsPlanActiveOrExecuting(curActionDTO.Id) && !force)
                 {
                     return new LockedHttpActionResult();
                 }

Controllers/Api/ActivityTemplatesController.cs

@@ -47,6 +47,9 @@ public IHttpActionResult Get()
             var categoriesWithActivities = _activity.GetAvailableActivityGroups();
             return Ok(categoriesWithActivities);
         }
+
+
+        //TODO inspect this - why do we have 2 different methods returning different responses by similar names?
         /// <summary>
         /// Retreives all available activity templates grouped by category
         /// </summary>

Controllers/Api/AlarmsController.cs

@@ -107,6 +107,10 @@ private static async Task<bool> RenewAuthToken(PollingDataDTO pollingData, strin
             using (var uow = ObjectFactory.GetInstance<IUnitOfWork>())
             {
                 var terminalDO = await ObjectFactory.GetInstance<ITerminal>().GetByToken(terminalToken);
+                if (terminalDO == null)
+                {
+                    throw new Exception("No terminal was found with token: "+terminalToken);
+                }
                 var token = uow.AuthorizationTokenRepository.FindTokenByExternalAccount(pollingData.ExternalAccountId, terminalDO.Id, pollingData.Fr8AccountId);
                 if (token != null)
                 {