Improve stories load

app/assets/javascripts/actions/actionTypes.js

@@ -13,10 +13,11 @@ export default keyMirror({
   ERROR_REQUEST_PAST_STORIES: null,
   CREATE_STORY: null,
   ADD_STORY: null,
+  EXPAND_STORY: null,
+  COLLAPSE_STORY: null,
   CLONE_STORY: null,
   RECEIVE_HISTORY: null,
   LOAD_HISTORY: null,
-  TOGGLE_STORY: null,
   EDIT_STORY: null,
   UPDATE_STORY: null,
   RECEIVE_HISTORY_ERROR: null,

app/assets/javascripts/actions/projectBoard.js

@@ -1,6 +1,6 @@
 import actionTypes from './actionTypes';
 import { receiveUsers } from './user';
-import { receiveStories, toggleStory } from './story';
+import { receiveStories, expandStory } from './story';
 import { receivePastIterations } from './pastIterations';
 import { storyScopes } from '../libs/beta/constants';
 import { sendErrorNotification } from './notifications';
@@ -57,7 +57,7 @@ export const expandStoryIfNeeded = (dispatch, getHash) => {
   const storyId = getHash('#story-');
 
   if (storyId) {
-    dispatch(toggleStory(parseInt(storyId)));
+    dispatch(expandStory(parseInt(storyId)));
     window.history.pushState('', '/', window.location.pathname);
   }
 };

app/assets/javascripts/actions/story.js

@@ -7,6 +7,8 @@ import {
 import { wait } from '../services/promises';
 import { storyScopes } from '../libs/beta/constants';
 import { storiesWithScope } from '../reducers/stories';
+import projectStoriesService from '../services/stories';
+import { isStoryLoading } from '../models/beta/story';
 
 export const createStory = (attributes, from) => ({
   type: actionTypes.CREATE_STORY,
@@ -20,6 +22,22 @@ export const addStory = (story, from) => ({
   from,
 });
 
+export const expandStory = (storyId, from) => {
+  return {
+    type: actionTypes.EXPAND_STORY,
+    storyId,
+    from,
+  };
+};
+
+export const collapseStory = (storyId, from) => {
+  return {
+    type: actionTypes.COLLAPSE_STORY,
+    storyId,
+    from,
+  };
+};
+
 export const loadHistory = title => ({
   type: actionTypes.LOAD_HISTORY,
   title,
@@ -82,12 +100,6 @@ export const deleteStorySuccess = (id, from) => ({
   from,
 });
 
-export const toggleStory = (id, from) => ({
-  type: actionTypes.TOGGLE_STORY,
-  id,
-  from,
-});
-
 export const editStory = (id, newAttributes, from) => ({
   type: actionTypes.EDIT_STORY,
   id,
@@ -111,7 +123,6 @@ export const fetchEpic =
     try {
       const { projectId } = getState().projectBoard;
       const storiesByLabel = await Story.getByLabel(label, projectId);
-
       dispatch(receiveStories(storiesByLabel, storyScopes.EPIC));
     } catch {
       dispatch(sendDefaultErrorNotification());
@@ -212,7 +223,7 @@ export const updateCollapsedStory =
     );
   };
 
-export const dragDropStory =
+export const dragDropStory = 
   (storyId, projectId, newAttributes, from) =>
   async (dispatch, getState, { Story }) => {
     const { stories } = getState();
@@ -229,9 +240,7 @@ export const dragDropStory =
     try {
       // Optimistic Update:
       dispatch(sortStories(storiesWithUpdatedPositions, from));
-
       const updatedStories = await Story.updatePosition(newStory);
-
       await wait(300);
       return dispatch(sortStories(updatedStories, from));
     } catch (error) {
@@ -340,7 +349,7 @@ export const saveStory =
       );
     }
 
-    return dispatch(toggleStory(story.id, from));
+    return dispatch(collapseStory(story.id, from));
   };
 
 export const deleteStory =
@@ -356,7 +365,6 @@ export const deleteStory =
       ).title;
 
       await Story.deleteStory(storyId, projectId);
-
       dispatch(deleteStorySuccess(storyId, from));
 
       return dispatch(

app/assets/javascripts/components/story/StoryItem.jsx

@@ -36,7 +36,9 @@ export const StoryItem = ({
 
   const childProps = {
     story,
-    onToggle: () => toggleStory(story.id, from),
+    onToggle: () => {
+      toggleStory(story, from);
+    },
     className,
     title,
     from,
@@ -62,4 +64,4 @@ StoryItem.propTypes = {
   toggleStory: PropTypes.func.isRequired,
 };
 
-export default connect(null, { toggleStory, fetchEpic })(StoryItem);
+export default connect(null, { fetchEpic, toggleStory })(StoryItem);

app/assets/javascripts/models/beta/story.js

@@ -175,6 +175,10 @@ export const search = async (queryParam, projectId) => {
   return data.map(item => deserialize(item.story));
 };
 
+export const isStoryLoading = story => {
+  return story._editing?.loading;
+};
+
 export const getByLabel = async (label, projectId) => {
   const { data } = await httpService.get(
     `/projects/${projectId}/stories?label=${label}`,
@@ -199,18 +203,6 @@ export const storyFailure = (story, error) => ({
   needsToSave: false,
 });
 
-export const toggleStory = story => {
-  const editing = story.collapsed
-    ? { ...story, _isDirty: false, loading: false }
-    : null;
-
-  return {
-    ...story,
-    _editing: editing,
-    collapsed: !story.collapsed,
-  };
-};
-
 const isUnscheduledState = (story, newAttributes) =>
   isFeature(story._editing) &&
   (isChangingWithoutEstimate(story, newAttributes) ||
@@ -303,7 +295,8 @@ export const deserialize = (data, options) => {
     ...story,
     labels: Label.splitLabels(story.labels),
     estimate: story.estimate || '',
-    collapsed,
+    documents: (story.documents ?? []).map(document => document.file),
+    collapsed
   };
 };
 

app/assets/javascripts/reducers/stories.js

@@ -1,13 +1,11 @@
 import actionTypes from 'actions/actionTypes';
 import {
-  toggleStory,
   editStory,
   addNewAttributes,
   setLoadingStory,
   setLoadingValue,
   cloneStory,
   storyFailure,
-  withoutNewStory,
   createNewStory,
   replaceOrAddNewStory,
 } from 'models/beta/story';
@@ -16,7 +14,7 @@ import * as Task from 'models/beta/task';
 import * as Label from 'models/beta/label';
 import { updateIfSameId } from '../services/updateIfSameId';
 import { storyScopes } from './../libs/beta/constants';
-import { isEpic, isSearch, isNew } from '../models/beta/story';
+import { isEpic, isSearch } from '../models/beta/story';
 
 const initialState = {
   [storyScopes.ALL]: {},
@@ -84,29 +82,50 @@ const storiesReducer = (state = initialState, action) => {
           )
         ),
       };
-    case actionTypes.CLONE_STORY:
-      const clonedStory = cloneStory(action.story);
-
+    case actionTypes.EXPAND_STORY:
       return {
         ...state,
-        [action.from]: normalizeStories(
-          replaceOrAddNewStory(denormalizedStories, clonedStory)
-        ),
+        [action.from]: {
+          stories: {
+            ...state[action.from].stories,
+            byId: {
+              ...state[action.from].stories.byId,
+              [action.storyId]: {
+                ...state[action.from].stories.byId[action.storyId],
+                collapsed: false,
+                _editing: {
+                  ...state[action.from].stories.byId[action.storyId],
+                  _isDirty: false,
+                  loading: false,
+                },
+              },
+            },
+          },
+        },
       };
-    case actionTypes.TOGGLE_STORY:
-      if (isNew(action)) {
-        return {
-          ...state,
-          [action.from]: normalizeStories(
-            withoutNewStory(denormalizedStories, action.id)
-          ),
-        };
-      }
+    case actionTypes.COLLAPSE_STORY:
+      return {
+        ...state,
+        [action.from]: {
+          stories: {
+            ...state[action.from].stories,
+            byId: {
+              ...state[action.from].stories.byId,
+              [action.storyId]: {
+                ...state[action.from].stories.byId[action.storyId],
+                collapsed: true,
+              },
+            },
+          },
+        },
+      };
+    case actionTypes.CLONE_STORY:
+      const clonedStory = cloneStory(action.story);
 
       return {
         ...state,
         [action.from]: normalizeStories(
-          denormalizedStories.map(updateIfSameId(action.id, toggleStory))
+          replaceOrAddNewStory(denormalizedStories, clonedStory)
         ),
       };
     case actionTypes.EDIT_STORY:

app/assets/javascripts/services/stories.js

@@ -0,0 +1,9 @@
+import httpService from './httpService';
+
+const ProjectStoriesService = {
+  async fetchStory(story) {
+    return httpService.get(`/projects/${story.projectId}/stories/${story.id}`);
+  },
+};
+
+export default ProjectStoriesService;

app/models/story.rb

@@ -20,6 +20,23 @@ class Story < ApplicationRecord
                                start_date.beginning_of_day,
                                end_date.end_of_day)
                            }
+  scope :not_accepted_or_recently_accepted, lambda { |current_iteration_start|
+    where.not(state: 'accepted').or(where('accepted_at >= ?', current_iteration_start))
+  }
+
+  scope :collapsed_story, lambda {
+    select(
+      :id,
+      :title,
+      :description,
+      :estimate,
+      :story_type,
+      :state,
+      :requested_by_name,
+      :owned_by_initials,
+      :project_id
+    )
+  }
 
   delegate :suppress_notifications, to: :project
 

app/operations/beta/project_board_operations/read.rb

@@ -3,6 +3,8 @@ module ProjectBoardOperations
     class Read
       include Operation
 
+      delegate :past_iterations, :current_iteration_start, to: :iterations
+
       def initialize(project_id:, current_user:, current_flow: nil, projects_scope: Project)
         @project_id = project_id
         @current_user = current_user
@@ -22,6 +24,14 @@ def call
 
       attr_reader :project_id, :current_user, :current_flow, :projects_scope
 
+      def iterations
+        @project_iterations ||= Iterations::ProjectIterations.new(project: project)
+      end
+
+      def project_iterations
+        Success(iterations)
+      end
+
       def create_project_board
         project_users = project.users
 
@@ -40,9 +50,25 @@ def create_project_board
       end
 
       def stories_and_past_iterations
-        read_all_result = yield ::StoryOperations::ReadAll.call(project: project)
-        read_all_result[:stories] = read_all_result.delete(:active_stories)
-        read_all_result
+        yield active_stories
+        yield project_iterations
+
+        yield Success(
+          stories: @active_stories,
+          past_iterations: past_iterations
+        )
+      end
+
+      def active_stories
+        @active_stories ||= begin
+            project
+              .stories
+              .not_accepted_or_recently_accepted(current_iteration_start)
+              .collapsed_story
+              .order('updated_at DESC')
+          end
+
+        Success(@active_stories)
       end
 
       def project_labels
@@ -55,7 +81,7 @@ def project
         @project ||= current_user
                      .projects
                      .friendly
-                     .preload(:users, stories: %i[notes tasks])
+                     .preload(:users)
                      .find(project_id)
       end
 

app/operations/story_operations/read_all.rb

@@ -32,12 +32,12 @@ def project_iterations
 
     def active_stories
       @active_stories ||= begin
-        project
-          .stories
-          .with_dependencies
-          .where("state != 'accepted' OR accepted_at >= ?", current_iteration_start)
-          .order('updated_at DESC')
-      end
+          project
+            .stories
+            .with_dependencies
+            .not_accepted_or_recently_accepted(current_iteration_start)
+            .order('updated_at DESC')
+        end
 
       Success(@active_stories)
     end