Correction generation fichier de configuration

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/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

@@ -18,7 +18,7 @@ export function* fetchIssuesSaga(action: any) {
       if (pageIssues.length === 0) {
         break;
       }
-      issues.push(...pageIssues);
+      issues.push(...pageIssues.filter(issue => issue.pull_request === null));
       page++;
     }
     

client/src/store/sagas/kanboards.ts

@@ -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() {

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

@@ -10,9 +10,11 @@ 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),

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,6 +2,7 @@
 export class GiteaUnauthorizedError extends Error {
   constructor(...args: any[]) {
     super(...args)
+    Object.setPrototypeOf(this, GiteaUnauthorizedError.prototype);
   }
 }
 

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);
+}

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

internal/config/config.go

@@ -20,6 +20,7 @@ type HTTPConfig struct {
 }
 
 type GiteaConfig struct {
+	BaseURL      string
 	ClientID     string
 	ClientSecret string
 	RedirectURL  string