Filtre des tickets par jalons

perte de session

README.md

@@ -9,6 +9,7 @@
 ### Procédure
 
 ```bash
+cd client && npm install # Installation des dépendances client
 make watch  # Surveiller les modifications sur le sources et compiler/démarrer le serveur
 ```
 

client/package.json

@@ -27,9 +27,9 @@
     "@fortawesome/fontawesome-free": "^5.11.2",
     "@types/node": "^13.13.4",
     "@types/react-dom": "^16.9.7",
+    "@types/react-redux": "^7.1.7",
     "@types/react-router-dom": "^5.1.5",
     "@types/uuid": "^7.0.3",
-    "@types/react-redux": "^7.1.7",
     "babel-loader": "^8.0.6",
     "css-loader": "^1.0.1",
     "extract-loader": "^3.1.0",
@@ -42,14 +42,15 @@
     "resolve-url-loader": "^3.0.0",
     "sass-loader": "^7.1.0",
     "style-loader": "^0.23.1",
+    "ts-loader": "^7.0.2",
     "webpack": "^4.25.0",
     "webpack-cleanup-plugin": "^0.5.1",
-    "webpack-cli": "^3.1.2",
+    "webpack-cli": "^3.1.2"
-    "ts-loader": "^7.0.2"
   },
   "dependencies": {
-    "@lourenci/react-kanban": "^0.15.0",
+    "@lourenci/react-kanban": "^2.0.0",
     "bulma": "^0.7.2",
+    "bulma-switch": "^2.0.0",
     "react": "^16.12.0",
     "react-dom": "^16.12.0",
     "react-redux": "^7.1.3",

client/src/components/BoardPage/BoardPage.tsx

@@ -1,18 +1,21 @@
-import React from 'react';
+import React, { Fragment } from 'react';
 import { Page } from '../Page';
 import { connect, DispatchProp } from 'react-redux';
-import Board from '@lourenci/react-kanban';
+import Board, { addColumn } from '@lourenci/react-kanban';
 import { fetchBoards } from '../../store/actions/boards';
-import { createIssue } from '../../store/actions/issues';
+import { createIssue, fetchIssues } from '../../store/actions/issues';
 import { buildKanboard, moveCard } from '../../store/actions/kanboards';
 import { Loader } from '../Loader';
 import { IssueCard } from './IssueCard';
 import { Modal } from '../Modal';
+import { fetchProjectMilestones } from '../../store/actions/projects';
 
 export interface BoardPageProps extends DispatchProp {
   board: any
   kanboard: any
+  milestones: any
 }
+
 export class BoardPage extends React.Component<BoardPageProps> {
 
   state = {
@@ -22,7 +25,10 @@ export class BoardPage extends React.Component<BoardPageProps> {
       title: "",
       body: "",
       project: ""
-    }
+    },
+    compactMode: true,
+    hasError: false,
+    selectedMilestone: "",
   }
 
   onNewCardTitleChange: (evt: any) => void;
@@ -40,41 +46,104 @@ export class BoardPage extends React.Component<BoardPageProps> {
     this.onNewCardSaveClick = this.onNewCardSaveClick.bind(this);
   }
 
+  componentDidCatch(error, errorInfo) {
+    // You can also log the error to an error reporting service
+    console.error(error, errorInfo);
+  }
+
+  handleMilestonesChange(e: any) {
+    console.log("EVT VALUE", e.target.value);
+    let m = (e.target as HTMLInputElement).value;
+    this.setState(state => ({ ...state, selectedMilestone: m }), this.requestBuildKanboard);
+    //this.requestBuildKanboard();
+  }
+
   render() {
     const { board } = this.props;
     return (
       <Page title={`${board ? (board.title + ' - ') : ''}GenGitKan`}>
-        <div className="container is-fluid">
         {this.renderBoard()}
-        </div>
       </Page>
     );
   }
 
   renderBoard() {
-    const { kanboard } = this.props;
+    const { kanboard, board, milestones } = this.props;
 
     if (!kanboard) {
       return <Loader></Loader>
     }
 
     return (
+      <Fragment>
+        <nav className="navbar is-light">
+          <div className="container is-fluid">
+            <div className="navbar-start">
+              <div className="navbar-item">
+                {board.title}
+              </div>
+            </div>
+            <div className="navbar-end">
+              <div className="navbar-item">
+                <div className="select">
+                  <select onChange={this.handleMilestonesChange.bind(this)}>
+                    <option value="">Sélectionner un jalon</option>
+                    {
+                      milestones.length > 0 ? milestones.map((k: any) => {
+                        return (
+                          <option value={k.title} key={k.id}>{k.title}</option>
+                        )
+                      }) : ""
+                    }
+                  </select>
+                </div>
+              </div>
+              <div className="navbar-item">
+
+                <div className="field">
+
+                  <input id="compactMode"
+                    checked={this.state.compactMode}
+                    onChange={this.onCompactModeChange.bind(this)}
+                    type="checkbox"
+                    className="switch is-outlined is-success"
+                    name="compactMode"
+                  />
+                  <label htmlFor="compactMode">Mode compact</label>
+                </div>
+              </div>
+              <a href={`#/boards/${board.id}/edit`} className="navbar-item">
+                <span className="icon">
+                  <i className="fa fa-edit fa-fw"></i>
+                </span>
+                <span>Modifier le tableau</span>
+              </a>
+            </div>
+          </div>
+        </nav>
+        <div className="container is-fluid">
           <div className="kanboard-container is-fullheight">
-        <Board disableLaneDrag={true}
+            <Board
-          renderCard={this.renderCard}
+              renderCard={this.renderCard.bind(this)}
-          renderLaneHeader={this.renderLaneHeader}
+              renderColumnHeader={this.renderLaneHeader.bind(this)}
-          onCardDragEnd={this.onCardDragEnd.bind(this)}>
+              onCardDragEnd={this.onCardDragEnd.bind(this)}
+              disableColumnDrag={true}
+            >
               {kanboard}
             </Board>
             {this.renderNewCardModal()}
           </div>
+        </div>
+      </Fragment>
+
     );
   }
 
   renderNewCardModal() {
     const { newCardModalActive, newCardLaneID } = this.state;
     const { board } = this.props;
-    if (!board || !newCardLaneID) return null;
+    if (!board || newCardLaneID === undefined) return null;
+
     return (
       <Modal active={newCardModalActive}>
         <div className="new-card-modal">
@@ -139,7 +208,7 @@ export class BoardPage extends React.Component<BoardPageProps> {
   }
 
   renderCard(card: any) {
-    return <IssueCard card={card} />;
+    return <IssueCard compact={this.state.compactMode} card={card} />;
   }
 
   renderLaneHeader(lane: any) {
@@ -147,28 +216,49 @@ export class BoardPage extends React.Component<BoardPageProps> {
       <div className="kanboard-lane">
         <div className="level">
           <div className="level-left">
-            <h3 className="level-item is-size-3">{lane.title}</h3>
+            <div className="level-item">
+              <span className="tag is-primary is-light is-normal">{lane.cards.length}</span>
             </div>
-          <div className="level-right">
+            <button className="button is-light level-item is-small expand"
-            <button className="button is-light level-item is-medium"
+              onClick={this.onMinimizeColumn}>
+              <span className="icon">
+                <i className="fas fa-chevron-right" aria-hidden="true"></i>
+              </span>
+            </button>
+            <h3 className="level-item is-size-5">
+              {lane.title}
+            </h3>
+          </div>
+          <div className="level-right is-show-expand">
+            <button className="button is-light level-item is-small"
               onClick={this.onNewCardClick.bind(this, lane.id)}>
               <span className="icon">
                 <i className="fas fa-plus" aria-hidden="true"></i>
               </span>
             </button>
+            <button className="button is-light level-item is-small"
+              onClick={this.onMinimizeColumn}>
+              <span className="icon">
+                <i className="fas fa-chevron-left" aria-hidden="true"></i>
+              </span>
+            </button>
           </div>
         </div>
       </div>
     )
   }
 
-  onCardDragEnd(source: any, dest: any) {
+  onMinimizeColumn(e: any) {
+    e.currentTarget.closest('.react-kanban-column').classList.toggle('minimized');
+  }
+
+  onCardDragEnd(card: any, source: any, dest: any) {
     const { board } = this.props;
     this.props.dispatch(moveCard(
       board.id,
-      source.fromLaneId,
+      source.fromColumnId,
       source.fromPosition,
-      dest.toLaneId,
+      dest.toColumnId,
       dest.toPosition
     ));
   }
@@ -235,8 +325,16 @@ export class BoardPage extends React.Component<BoardPageProps> {
 
   requestBuildKanboard() {
     const { board } = this.props;
+    const { selectedMilestone } = this.state;
+    console.log("SELECTED MILESTONE", selectedMilestone)
     if (!board) return;
-    this.props.dispatch(buildKanboard(board));
+    this.props.dispatch(fetchProjectMilestones(board.projects[0]));
+    this.props.dispatch(buildKanboard(board, selectedMilestone));
+  }
+
+  onCompactModeChange(evt: React.ChangeEvent) {
+    const checked = (evt.currentTarget as HTMLInputElement).checked;
+    this.setState(state => ({ ...state, compactMode: checked }));
   }
 
 }
@@ -245,6 +343,7 @@ export const ConnectedBoardPage = connect(function(state: any, props: any) {
   const boardID = props.match.params.id;
   return {
     board: state.boards.byID[boardID],
-    kanboard: state.kanboards.byID[boardID]
+    kanboard: state.kanboards.byID[boardID],
+    milestones: state.projects.milestones
   };
 })(BoardPage);

client/src/components/BoardPage/IssueCard.tsx

@@ -1,50 +1,63 @@
 import React from 'react';
+import { KanboardCard } from '../../types/kanboard';
 
 export interface IssueCardProps {
-  card: any
+  card: KanboardCard
+  compact: boolean
 }
 
 export class IssueCard extends React.PureComponent<IssueCardProps> {
   render() {
-    const { card } = this.props;
+    
+    const { card, compact } = this.props;
     const issueURLInfo = extractInfoFromIssueURL(card.issue.url);
     const projectURL = `${issueURLInfo.baseURL}/${issueURLInfo.owner}/${issueURLInfo.projectName}`;
     const issueURL = `${projectURL}/issues/${card.issue.number}`;
+
     return (
       <div className="kanboard-card">
-        <div className="box">
+        <div className="box has-padding-small is-radiusless">
           <div className="media">
+            <div className="media-content">
+              <div className="content">
+                { !compact && 
+                  <nav className="level">
+                    <div className="level-left">
+                      <div className="level-item">
+                        <a target="_blank" href={issueURL}><strong>{`#${card.issue.number}`}</strong></a>
+                      </div>
+                      { !compact && 
+                        <div className="level-item">
+                          <a target="_blank" href={projectURL}>{card.project}</a>
+                        </div>
+                      }
+                    </div>
+                    <div className="level-right">
                       {
-              card.issue.assignee ?
+                        card.issue.assignee && !compact ?
-              <div className="media-left">
+                          <div className="level-item">
-                <figure className="image is-64x64">
-                  <img src={card.issue.assignee.avatar_url} alt="Image" />
-                </figure>
                             <small>{`@${card.issue.assignee.login}`}</small>
                           </div>
                         : null
                       }
-            <div className="media-content">
-              <div className="content">
-                <p>
-                  <strong>{`#${card.issue.number}`}</strong>&nbsp;
-                  { card.issue.milestone ? <small>{`- ${card.issue.milestone.title}`}</small> : null }
-                  <br />
-                  <span className="is-size-6">{card.issue.title}</span>
-                </p>
                     </div>
+                  </nav>
+                }
+                { compact &&
+                  <a target="_blank" className="mr-1" href={issueURL}><strong>{`#${card.issue.number}`}</strong></a>
+                }
+                <span>{card.issue.title ? card.issue.title : ''}</span>
               </div>
-          </div>
+              { !compact &&
-          <div className="level is-mobile" style={{marginTop:'1rem'}}>
+                <nav className="level">
-            <div className="level-left">
+                  <div className="level-left"></div>
-              <small className="level-item"><a href={projectURL}>{card.project}</a></small>
-            </div>
                   <div className="level-right">
-              <a className="level-item" target="_blank" href={issueURL}>
+                    <div className="level-item is-size-7">
-                <span className="icon is-small has-text-info">
+                      {card.issue.milestone ? card.issue.milestone.title : ''}
-                  <i className="fas fa-search" aria-hidden="true"></i>
+                    </div>
-                </span>
+                  </div>
-              </a>
+                </nav>
+              }
             </div>
           </div>
         </div>

client/src/sass/_all.scss

@@ -1,4 +1,6 @@
 @import 'bulma/bulma.sass';
+@import '../../node_modules/@lourenci/react-kanban/dist/styles.css';
+@import 'bulma-switch/dist/css/bulma-switch.sass';
 @import '_base.scss';
 @import '_loader.scss';
 @import '_kanboard.scss';

client/src/sass/_base.scss

@@ -11,7 +11,15 @@ html, body {
     margin-top: $size-normal;
 }
 
+.has-padding-small {
+    padding: 1rem;
+}
+
 #app {
     display: flex;
     flex-direction: column;
 }
+
+.mr-1 {
+    margin-right: 5px;
+}

client/src/sass/_kanboard.scss

@@ -44,6 +44,12 @@
 
     .kanboard-lane {
         margin-bottom: $size-small;
+        background: $white;
+        top: 0;
+
+        .expand {
+            display: none;
+        }
     }
 }
 
@@ -52,3 +58,141 @@
     align-items: center;
     width: 50% !important;
 }
+
+.react-kanban-board {
+    max-height: calc(100vh - calc(52px * 2));
+    overflow: hidden;
+    overflow-x: scroll;
+
+    scrollbar-color: $grey-lighter, #f1f1f1;
+    scrollbar-width: 5px;
+
+    &::-webkit-scrollbar {
+        width: 5px;
+        height: 5px;
+    }
+
+    /* Track */
+    &::-webkit-scrollbar-track {
+        background: #f1f1f1;
+    }
+
+    /* Handle */
+    &::-webkit-scrollbar-thumb {
+        background: $grey-lighter;
+    }
+
+    /* Handle on hover */
+    &::-webkit-scrollbar-thumb:hover {
+        background: $green;
+    }
+}
+
+.react-kanban-column {
+    transition: width ease .2s;
+    max-width: 305px;
+    min-width: 305px;
+    position: relative;
+
+    max-height: 100%;
+    overflow-x: hidden;
+    overflow-y: scroll;
+
+    scrollbar-color: $grey-lighter, #f1f1f1;
+    scrollbar-width: 5px;
+
+    .kanboard-card {
+        display: block;
+    }
+
+    &.minimized {
+        max-width: 70px;
+        min-width: 70px;
+        
+        writing-mode: vertical-rl;
+        text-orientation: sideways-right;
+
+        
+
+        .level-item {
+            margin-right: 0;
+        }
+
+        .level-left {
+            margin-right: 0;
+        }
+
+        .level-right.is-show-expand {
+            display: none;
+        }
+
+        .kanboard-lane {
+            /*margin-right: -1em;*/
+
+            h3 {
+                margin-top: .5em;
+                /*margin-right: -.5em;*/
+            }
+
+            .tag {
+                writing-mode: horizontal-tb;
+            }
+
+            .expand {
+                display: block !important;
+                margin-top: .5em;
+            }
+        }
+
+        .kanboard-card {
+            display: none;
+        }
+        
+    }
+    
+
+    &::-webkit-scrollbar {
+        width: 5px;
+    }
+
+    /* Track */
+    &::-webkit-scrollbar-track {
+        background: #f1f1f1;
+    }
+
+    /* Handle */
+    &::-webkit-scrollbar-thumb {
+        background: $grey-lighter;
+    }
+
+    /* Handle on hover */
+    &::-webkit-scrollbar-thumb:hover {
+        background: $green;
+    }
+}
+
+.react-kanban-card__title {
+    position: sticky;
+    position: -webkit-sticky;
+}
+
+.react-kanban-column {
+    background: white !important;
+}
+
+
+.kanboard-card {
+    overflow-wrap: break-word;
+
+    a {
+        display: inline-block;
+    }
+
+    .level {
+        margin-bottom: 0;
+    }
+
+    .level-item {
+        max-width: 100%;
+    }
+}

client/src/store/actions/issues.ts

@@ -2,8 +2,8 @@ export const FETCH_ISSUES_REQUEST = "FETCH_ISSUES_REQUEST";
 export const FETCH_ISSUES_SUCCESS = "FETCH_ISSUES_SUCCESS";
 export const FETCH_ISSUES_FAILURE = "FETCH_ISSUES_FAILURE";
 
-export function fetchIssues(project: any) {
+export function fetchIssues(project: any, milestones: string) {
-  return { type: FETCH_ISSUES_REQUEST, project };
+  return { type: FETCH_ISSUES_REQUEST, project, milestones };
 };
 
 export const ADD_LABEL_REQUEST = "ADD_LABEL_REQUEST";

client/src/store/actions/kanboards.ts

@@ -2,8 +2,8 @@ export const BUILD_KANBOARD_REQUEST = "BUILD_KANBOARD_REQUEST";
 export const BUILD_KANBOARD_SUCCESS = "BUILD_KANBOARD_SUCCESS";
 export const BUILD_KANBOARD_FAILURE = "BUILD_KANBOARD_FAILURE";
 
-export function buildKanboard(board: string) {
+export function buildKanboard(board: string, milestones: string) {
-  return { type: BUILD_KANBOARD_REQUEST, board };
+  return { type: BUILD_KANBOARD_REQUEST, board, milestones };
 };
 
 export const MOVE_CARD = "MOVE_CARD";

client/src/store/actions/projects.ts

@@ -2,6 +2,14 @@ export const FETCH_PROJECTS_REQUEST = "FETCH_PROJECTS_REQUEST";
 export const FETCH_PROJECTS_SUCCESS = "FETCH_PROJECTS_SUCCESS";
 export const FETCH_PROJECTS_FAILURE = "FETCH_PROJECTS_FAILURE";
 
+export const FETCH_PROJECT_MILESTONES_REQUEST = "FETCH_PROJECTS_MILESTONES_REQUEST";
+export const FETCH_PROJECT_MILESTONES_SUCCESS = "FETCH_PROJECTS_MILESTONES_SUCCESS";
+export const FETCH_PROJECT_MILESTONES_FAILURE = "FETCH_PROJECTS_MILESTONES_FAILURE";
+
 export function fetchProjects() {
   return { type: FETCH_PROJECTS_REQUEST };
 };
+
+export function fetchProjectMilestones(project: any) {
+  return { type: FETCH_PROJECT_MILESTONES_REQUEST, project };
+};

client/src/store/reducers/kanboards.ts

@@ -37,22 +37,22 @@ function handleMoveCard(state: any, action: any) {
 
   const kanboard = state.byID[boardID];
 
-  const lanes = [ ...kanboard.lanes ];
+  const columns = [ ...kanboard.columns ];
-  const fromLane = lanes[fromLaneID];
+  const fromLane = columns[fromLaneID];
-  const toLane = lanes[toLaneID];
+  const toLane = columns[toLaneID];
   const card = fromLane.cards[fromPosition];
 
   const fromCards = [ ...fromLane.cards ];
   if (fromLaneID !== toLaneID) {
     fromCards.splice(fromPosition, 1);
-    lanes[fromLaneID] = {
+    columns[fromLaneID] = {
       ...fromLane,
       cards: fromCards,
     };
   
     const toCards = [ ...toLane.cards ];
     toCards.splice(toPosition, 0, card);
-    lanes[toLaneID] = {
+    columns[toLaneID] = {
       ...toLane,
       cards: toCards,
     };
@@ -67,7 +67,7 @@ function handleMoveCard(state: any, action: any) {
       ...state.byID,
       [boardID]: {
         ...state.byID[boardID],
-        lanes,
+        columns,
       },
     }
   };

client/src/store/reducers/projects.ts

@@ -1,13 +1,18 @@
-import { FETCH_PROJECTS_SUCCESS } from "../actions/projects";
+import { FETCH_PROJECTS_SUCCESS, FETCH_PROJECT_MILESTONES_SUCCESS } from "../actions/projects";
 
 export const defaultState = {
   byName: {},
+  milestones: ""
 };
 
 export function projectsReducer(state = defaultState, action: any) {
   switch (action.type) {
     case FETCH_PROJECTS_SUCCESS:
       return handleFetchProjectsSuccess(state, action);
+
+    case FETCH_PROJECT_MILESTONES_SUCCESS:
+      return handleFetchProjectMilestonesSuccess(state, action);
+
     default:
       return state;
   }
@@ -25,3 +30,10 @@ function handleFetchProjectsSuccess(state: any, action: any) {
     }
   };
 }
+
+function handleFetchProjectMilestonesSuccess(state: any, action: any) {
+  return {
+    ...state,
+    milestones: action.milestones,
+  };
+}

client/src/store/sagas/failure.ts

@@ -1,10 +1,11 @@
 import { GiteaUnauthorizedError } from "../../util/gitea";
 import { put } from 'redux-saga/effects';
 import { logout } from '../actions/logout';
+import { saveReferer } from "../../util/referer";
 
 export function* failuresSaga(action) {
-  const err = action.error;
+  if (action.error instanceof GiteaUnauthorizedError) {
-  if (err instanceof GiteaUnauthorizedError) {
+    saveReferer();
     yield put(logout());
   }
 }

client/src/store/sagas/issues.ts

@@ -8,17 +8,17 @@ import {
 import { gitea } from '../../util/gitea';
 
 export function* fetchIssuesSaga(action: any) {
-  const { project } = action;
+  const { project, milestones } = action;
 
   let issues = [];
   try {
     let page = 1;
     while (true) {
-      let pageIssues = yield call(gitea.fetchIssues.bind(gitea), action.project, page);
+      let pageIssues = yield call(gitea.fetchIssues.bind(gitea), project, page, milestones);
       if (pageIssues.length === 0) {
         break;
       }
-      issues.push(...pageIssues);
+      issues.push(...pageIssues.filter(issue => issue.pull_request === null));
       page++;
     }
 
@@ -76,14 +76,9 @@ export function* createIssueSaga(action: any) {
   const labels = yield call(gitea.fetchProjectLabels.bind(gitea), project);
   const giteaLabel = labels.find((l: any) => l.name === label)
 
-  if (!giteaLabel) {
-    yield put({ type: CREATE_ISSUE_FAILURE, error: new Error(`Label "${label}" not found !`) });
-    return;
-  }
-
   let issue;
   try {
-    issue = yield call(gitea.createIssue.bind(gitea), project, title, body, giteaLabel.id);
+    issue = yield call(gitea.createIssue.bind(gitea), project, title, body, giteaLabel ? giteaLabel.id : null);
   } catch (error) {
     yield put({ type: CREATE_ISSUE_FAILURE, error });
     return;

client/src/store/sagas/kanboards.ts

@@ -22,7 +22,7 @@ export function* moveCardSaga(action: any) {
     }
   });
 
-  const toLane = kanboard.lanes[toLaneID];
+  const toLane = kanboard.columns[toLaneID];
   const card = toLane.cards[toPosition];
 
   if (!card) return;
@@ -33,14 +33,14 @@ export function* moveCardSaga(action: any) {
 }
 
 export function* buildKanboardSaga(action: any) {
-  const { board } = action;
+  const { board, milestones } = action;
-
+  console.log("milestones", milestones);
   let kanboard;
   try {
 
     for (let p, i = 0; (p = board.projects[i]); i++) {
-      const { project } = yield fetchIssues(p);
+      const { project } = yield fetchIssues(p, "test");
-      yield fetchIssuesSaga({ project });
+      yield fetchIssuesSaga({ project: project, milestones: milestones });
     }
 
     const issues = yield select(state => state.issues);
@@ -56,14 +56,14 @@ export function* buildKanboardSaga(action: any) {
 }
 
 export function* refreshKanboardSaga(action: any) {
-  const { project } = action;
+  const { project, milestones } = action;
   const boards = yield select(state => state.boards);
   const boardValues = Object.values(boards.byID);
 
   for (let b: any, i = 0; (b = boardValues[i]); i++) {
     const hasProject = b.projects.indexOf(project) !== -1;
     if (!hasProject) continue;
-    yield put(buildKanboard(b));
+    yield put(buildKanboard(b, milestones));
   }
 }
 
@@ -75,13 +75,13 @@ function createCards(projects: Project[], issues: any, lane: BoardLane, rest: Se
     return projectIssues.reduce((projectCards: KanboardCard[], issue: any) => {
 
       const hasLabel = issue.labels.some((l: any) => l.name === lane.issueLabel);
-      const card = getMemoizedKanboardCard(issue.id, issue.title, p, issue);
+      const { card, memoized } = getMemoizedKanboardCard(issue.id, issue.title, p, issue);
 
       if (hasLabel) {
         projectCards.push(card);
         rest.delete(card);
       } else {
-        rest.add(card);
+        if (!memoized) rest.add(card);
       }
 
       return projectCards;
@@ -95,11 +95,19 @@ function createCards(projects: Project[], issues: any, lane: BoardLane, rest: Se
 
 const kanboardCardMemo: { [key: string]: KanboardCard } = {};
 
-function getMemoizedKanboardCard(id: number, title: string, project: Project, issue: Issue): KanboardCard {
+function getKanboardCardMemoizationKey(id: number, project: Project, issue: Issue) {
-  const key = `${project.id}-${issue.id}-${id}`;
+  return `${project.id}-${issue.id}-${id}`;
-  if (kanboardCardMemo.hasOwnProperty(key)) return kanboardCardMemo[key];
+}
+
+function isKanboardCardMemoized(key: string) {
+  return kanboardCardMemo.hasOwnProperty(key)
+}
+
+function getMemoizedKanboardCard(id: number, title: string, project: Project, issue: Issue) {
+  const key = getKanboardCardMemoizationKey(id, project, issue);
+  if (isKanboardCardMemoized(key)) return { card: kanboardCardMemo[key], memoized: true };
   kanboardCardMemo[key] = { id, title, project, issue };
-  return kanboardCardMemo[key];
+  return { card: kanboardCardMemo[key], memoized: false };
 }
 
 function resetKandboarCardMemo() {
@@ -137,7 +145,7 @@ function createKanboard(board: Board, issues: any) {
 
   const kanboard = {
     id: board.id,
-    lanes: createKanboardLanes(board, issues),
+    columns: createKanboardLanes(board, issues),
   };
 
   return kanboard;

client/src/store/sagas/projects.ts

@@ -1,5 +1,5 @@
 import { put, call } from 'redux-saga/effects';
-import { FETCH_PROJECTS_SUCCESS, FETCH_PROJECTS_FAILURE } from '../actions/projects';
+import { FETCH_PROJECTS_SUCCESS, FETCH_PROJECTS_FAILURE, FETCH_PROJECT_MILESTONES_FAILURE, FETCH_PROJECT_MILESTONES_SUCCESS } from '../actions/projects';
 import { gitea } from '../../util/gitea';
 
 export function* fetchProjectsSaga() {
@@ -14,3 +14,16 @@ export function* fetchProjectsSaga() {
 
   yield put({ type: FETCH_PROJECTS_SUCCESS, projects });
 }
+
+export function* fetchProjectMilestonesSaga(action: any) {
+  const { project } = action;
+  let milestones;
+  try {
+    milestones = yield call(gitea.fetchMilestones.bind(gitea), project)
+  } catch (error) {
+    yield put({ type: FETCH_PROJECT_MILESTONES_FAILURE, error });
+    return;
+  }
+
+  yield put({ type: FETCH_PROJECT_MILESTONES_SUCCESS, milestones });
+}

client/src/store/sagas/referer.ts

@@ -0,0 +1,9 @@
+import { hasReferer, getReferer, clearReferer } from '../../util/referer';
+
+export function* navigateToRefererSaga() {
+    if (!hasReferer()) return;
+    const referer = getReferer();
+    console.log("Redirecting to referer", referer);
+    clearReferer();
+    window.location.hash = referer;
+}

client/src/store/sagas/root.ts

@@ -4,15 +4,17 @@ import { FETCH_BOARDS_REQUEST, SAVE_BOARD_REQUEST, DELETE_BOARD_REQUEST } from '
 import { fetchBoardsSaga, saveBoardSaga, deleteBoardSaga } from './boards';
 import { FETCH_ISSUES_REQUEST, ADD_LABEL_REQUEST, REMOVE_LABEL_REQUEST, CREATE_ISSUE_REQUEST, CREATE_ISSUE_SUCCESS } from '../actions/issues';
 import { fetchIssuesSaga, addLabelSaga, removeLabelSaga, createIssueSaga } from './issues';
-import { FETCH_PROJECTS_REQUEST } from '../actions/projects';
+import { FETCH_PROJECTS_REQUEST, FETCH_PROJECT_MILESTONES_REQUEST } from '../actions/projects';
-import { fetchProjectsSaga } from './projects';
+import { fetchProjectMilestonesSaga, fetchProjectsSaga } from './projects';
 import { LOGOUT_REQUEST, LOGOUT_SUCCESS } from '../actions/logout';
 import { logoutSaga, logoutSuccessSaga } from './logout';
 import { BUILD_KANBOARD_REQUEST, MOVE_CARD } from '../actions/kanboards';
 import { buildKanboardSaga, moveCardSaga, refreshKanboardSaga } from './kanboards';
+import { navigateToRefererSaga } from './referer';
 
 export function* rootSaga() {
   yield all([
+    navigateToRefererSaga(),
     takeEvery(patternFromRegExp(/^.*_FAILURE/), failuresSaga),
     takeLatest(FETCH_BOARDS_REQUEST, fetchBoardsSaga),
     takeLatest(BUILD_KANBOARD_REQUEST, buildKanboardSaga),
@@ -20,6 +22,7 @@ export function* rootSaga() {
     takeLatest(DELETE_BOARD_REQUEST, deleteBoardSaga),
     takeLatest(FETCH_ISSUES_REQUEST, fetchIssuesSaga),
     takeLatest(FETCH_PROJECTS_REQUEST, fetchProjectsSaga),
+    takeLatest(FETCH_PROJECT_MILESTONES_REQUEST, fetchProjectMilestonesSaga),
     takeEvery(MOVE_CARD, moveCardSaga),
     takeEvery(ADD_LABEL_REQUEST, addLabelSaga),
     takeEvery(REMOVE_LABEL_REQUEST, removeLabelSaga),

client/src/store/store.ts

@@ -1,4 +1,4 @@
-import { createStore, applyMiddleware } from 'redux'
+import { createStore, applyMiddleware, compose } from 'redux'
 import createSagaMiddleware from 'redux-saga'
 import { rootReducer }  from './reducers/root'
 import { rootSaga } from './sagas/root'
@@ -14,6 +14,8 @@ if (process.env.NODE_ENV !== 'production') {
   reduxMiddlewares.push(loggerMiddleware);
 }
 
+const composeEnhancers = (window as any).__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose;
+
 // create the saga middleware
 const sagaMiddleware = createSagaMiddleware()
 reduxMiddlewares.push(sagaMiddleware);
@@ -21,7 +23,7 @@ reduxMiddlewares.push(sagaMiddleware);
 // mount it on the Store
 export const store = createStore(
   rootReducer,
-  applyMiddleware(...reduxMiddlewares)
+  composeEnhancers(applyMiddleware(...reduxMiddlewares)),
 )
 
 // then run the saga

client/src/util/gitea.ts

@@ -2,13 +2,22 @@
 export class GiteaUnauthorizedError extends Error {
   constructor(...args: any[]) {
     super(...args)
+    Object.setPrototypeOf(this, GiteaUnauthorizedError.prototype);
   }
 }
 
 export class GiteaClient {
 
-  fetchIssues(project: any, page = 1) {
+  fetchIssues(project: any, page = 1, milestones = "") {
-    return fetch(`/gitea/api/v1/repos/${project}/issues?page=${page}`)
+    return fetch(`/gitea/api/v1/repos/${project}/issues?page=${page}&milestones=${milestones}`)
+      .then(this.assertAuthorization)
+      .then(this.assertOk)
+      .then(res => res.json())
+      ;
+  }
+
+  fetchMilestones(project: any) {
+    return fetch(`/gitea/api/v1/repos/${project}/milestones`)
       .then(this.assertAuthorization)
       .then(this.assertOk)
       .then(res => res.json())
@@ -61,7 +70,7 @@ export class GiteaClient {
       body: JSON.stringify({
         title,
         body,
-        labels: [labelID],
+        labels: labelID ? [labelID] : undefined,
       }),
     })
       .then(this.assertAuthorization)

client/src/util/referer.ts

@@ -0,0 +1,19 @@
+const localStorage = window.localStorage;
+const refererKey = 'referer';
+
+export function getReferer() {
+    return localStorage.getItem(refererKey);
+}
+
+export function saveReferer() {
+    console.log("Saving referer", window.location.hash);
+    localStorage.setItem(refererKey, window.location.hash);
+}
+
+export function hasReferer() {
+    return !!getReferer();
+}
+
+export function clearReferer() {
+    localStorage.removeItem(refererKey);
+}

client/webpack.config.js

@@ -19,7 +19,7 @@ module.exports = {
   },
   module: {
     rules: [{
-      test: /\.scss$/,
+      test: /\.s(a|c)ss$/,
       use: [
         MiniCssExtractPlugin.loader,
         {

cmd/server/container.go

@@ -28,7 +28,7 @@ func getServiceContainer(conf *config.Config) (*service.Container, error) {
 
 	ctn.Provide(
 		session.ServiceName,
-		gorilla.ServiceProvider("gitea-kan", cookieStore),
+		gorilla.ServiceProvider("gengitkan", cookieStore),
 	)
 
 	// Create and expose config service provider

debian/compat

@@ -1 +0,0 @@
-9

debian/control

@@ -1,14 +0,0 @@
-Source: gengitkan
-Section: unknown
-Priority: optional
-Maintainer: William Petit <wpetit@cadoles.com>
-Build-Depends: debhelper (>= 8.0.0), wget, ca-certificates, tar
-Standards-Version: 3.9.4
-Homepage: http://forge.cadoles.com/wpetit/gengitkan
-Vcs-Git: http://forge.cadoles.com/wpetit/gengitkan.git
-Vcs-Browser: http://forge.cadoles.com/wpetit/gengitkan
-
-Package: gengitkan
-Architecture: amd64
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Application type "Kanboard" connectée à Gitea

debian/gengitkan.dirs

@@ -1 +0,0 @@
-var/lib/gengitkan

debian/gengitkan.service

@@ -1,13 +0,0 @@
-[Unit]
-Description=Application type "Kanboard" connectée à Gitea
-After=network-online.target
-
-[Service]
-Type=simple
-Environment=GENGITKAN_HTTP_PUBDIR=/usr/share/gengitkan/public
-Environment=GENGITKAN_DATA_DBPATH=/var/lib/gengitkan/data.db
-ExecStart=/usr/bin/gengitkan -workdir /usr/share/gengitkan -config /etc/gengitkan/server.conf
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target

debian/rules

@@ -1,54 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-
-# Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
-
-GO_VERSION := 1.13.5
-OS := linux
-ARCH := amd64
-GOPATH=$(HOME)/go
-
-ifeq (, $(shell which go 2>/dev/null))
-override_dh_auto_build: install-go
-endif
-
-ifeq (, $(shell which node 2>/dev/null))
-override_dh_auto_build: install-nodejs
-endif
-
-%:
-	dh $@ --with systemd
-
-override_dh_auto_build: $(GOPATH)
-	cd client && npm install
-	GOPATH=$(GOPATH) PATH="$(PATH):/usr/local/go/bin:$(GOPATH)/bin" go mod vendor
-	GOPATH=$(GOPATH) PATH="$(PATH):/usr/local/go/bin:$(GOPATH)/bin" ARCH_TARGETS=$(ARCH) make release
-
-$(GOPATH):
-	mkdir -p $(GOPATH)
-	
-install-go:
-	wget https://dl.google.com/go/go$(GO_VERSION).$(OS)-$(ARCH).tar.gz
-	tar -C /usr/local -xzf go$(GO_VERSION).$(OS)-$(ARCH).tar.gz
-
-install-nodejs:
-	wget -O- https://deb.nodesource.com/setup_12.x | bash -
-	apt-get install -y nodejs
-
-override_dh_auto_install:
-
-	mkdir -p debian/gengitkan/usr/share/gengitkan
-	mkdir -p debian/gengitkan/etc/gengitkan
-	mkdir -p debian/gengitkan/usr/bin
-
-	cp -r release/server-$(OS)-$(ARCH)/* debian/gengitkan/usr/share/gengitkan/
-	
-	mv debian/gengitkan/usr/share/gengitkan/bin/server debian/gengitkan/usr/bin/gengitkan
-	mv debian/gengitkan/usr/share/gengitkan/server.conf debian/gengitkan/etc/gengitkan/server.conf
-
-	install -d debian/gengitkan
-
-override_dh_strip:
-
-override_dh_auto_test:

debian/source/format

@@ -1 +0,0 @@
-3.0 (native)