GitHub-Proxy/signoz
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SigNoz/signoz synced 2025-09-13 20:43:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1145 from palash-signoz/bug-double-org

Browse Source 
bug: double org is fixed
This commit is contained in:
palash-signoz 2022-05-19 16:09:28 +05:30 committed by GitHub
commit d964b66bcc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/src/api/utils.ts
View File

@ -5,6 +5,7 @@ import history from 'lib/history';
import store from 'store'; import store from 'store';
import { import {
LOGGED_IN, LOGGED_IN,
UPDATE_ORG,
UPDATE_USER, UPDATE_USER,
UPDATE_USER_ACCESS_REFRESH_ACCESS_TOKEN, UPDATE_USER_ACCESS_REFRESH_ACCESS_TOKEN,
UPDATE_USER_ORG_ROLE, UPDATE_USER_ORG_ROLE,
@ -51,5 +52,12 @@ export const Logout = (): void => {
}, },
}); });
store.dispatch({
type: UPDATE_ORG,
payload: {
org: [],
},
});
history.push(ROUTES.LOGIN); history.push(ROUTES.LOGIN);
}; };

2
frontend/src/container/OrganizationSettings/DisplayName/index.tsx
View File

@ -38,7 +38,7 @@ function DisplayName({
dispatch({ dispatch({
type: UPDATE_ORG_NAME, type: UPDATE_ORG_NAME,
payload: { payload: {
index, orgId,
name: orgName, name: orgName,
}, },
}); });

19
frontend/src/store/reducers/app.ts
View File

@ -12,6 +12,7 @@ import {
UPDATE_CURRENT_VERSION, UPDATE_CURRENT_VERSION,
UPDATE_LATEST_VERSION, UPDATE_LATEST_VERSION,
UPDATE_LATEST_VERSION_ERROR, UPDATE_LATEST_VERSION_ERROR,
UPDATE_ORG,
UPDATE_ORG_NAME, UPDATE_ORG_NAME,
UPDATE_USER, UPDATE_USER,
UPDATE_USER_ACCESS_REFRESH_ACCESS_TOKEN, UPDATE_USER_ACCESS_REFRESH_ACCESS_TOKEN,
@ -172,16 +173,19 @@ const appReducer = (
case UPDATE_ORG_NAME: { case UPDATE_ORG_NAME: {
const stateOrg = state.org || ({} as OrgPayload); const stateOrg = state.org || ({} as OrgPayload);
const { index, name: updatedName } = action.payload; const { orgId, name: updatedName } = action.payload;
const current = stateOrg[index];
const orgIndex = stateOrg.findIndex((e) => e.id === orgId);
const current = stateOrg[orgIndex];
const updatedOrg: OrgPayload = [ const updatedOrg: OrgPayload = [
...stateOrg.slice(0, index), ...stateOrg.slice(0, orgIndex),
{ {
...current, ...current,
name: updatedName, name: updatedName,
}, },
...stateOrg.slice(index + 1, stateOrg.length), ...stateOrg.slice(orgIndex + 1, stateOrg.length),
]; ];
return { return {
@ -190,6 +194,13 @@ const appReducer = (
}; };
} }
case UPDATE_ORG: {
return {
...state,
org: action.payload.org,
};
}
default: default:
return state; return state;
} }

13
frontend/src/types/actions/app.ts
View File

@ -20,6 +20,7 @@ export const UPDATE_USER_IS_FETCH = 'UPDATE_USER_IS_FETCH';
export const UPDATE_USER_ORG_ROLE = 'UPDATE_USER_ORG_ROLE'; export const UPDATE_USER_ORG_ROLE = 'UPDATE_USER_ORG_ROLE';
export const UPDATE_USER = 'UPDATE_USER'; export const UPDATE_USER = 'UPDATE_USER';
export const UPDATE_ORG_NAME = 'UPDATE_ORG_NAME'; export const UPDATE_ORG_NAME = 'UPDATE_ORG_NAME';
export const UPDATE_ORG = 'UPDATE_ORG';
export interface SwitchDarkMode { export interface SwitchDarkMode {
type: typeof SWITCH_DARK_MODE; type: typeof SWITCH_DARK_MODE;
@ -98,7 +99,14 @@ export interface UpdateOrgName {
type: typeof UPDATE_ORG_NAME; type: typeof UPDATE_ORG_NAME;
payload: { payload: {
name: string; name: string;
index: number; orgId: string;
};
}
export interface UpdateOrg {
type: typeof UPDATE_ORG;
payload: {
org: AppReducer['org'];
}; };
} }
@ -113,4 +121,5 @@ export type AppAction =
| UpdateUserIsFetched | UpdateUserIsFetched
| UpdateUserOrgRole | UpdateUserOrgRole
| UpdateUser | UpdateUser
| UpdateOrgName; | UpdateOrgName
| UpdateOrg;