Skip to content

Commit ea3f571

Browse files
author
Hugo Marcellin
committed
Remove utils functions
1 parent 98c987b commit ea3f571

File tree

10 files changed

+13
-139
lines changed

10 files changed

+13
-139
lines changed

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/routes/router.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import {
1818
fetchAuthorizationCodeFlowFeatureFlag,
1919
getPreLoginPath,
2020
initializeAuthenticationProd,
21+
getErrorMessage,
2122
} from '@gridsuite/commons-ui';
2223
import {
2324
createBrowserRouter,
@@ -38,7 +39,6 @@ import { Users, Profiles } from '../pages';
3839
import ErrorPage from './ErrorPage';
3940
import { updateUserManagerDestructured } from '../redux/actions';
4041
import HomePage from './HomePage';
41-
import { getErrorMessage } from '../utils/error';
4242

4343
export enum MainPaths {
4444
users = 'users',

src/services/config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
PARAM_LANGUAGE,
1212
PARAM_THEME,
1313
} from '../utils/config-params';
14-
import { backendFetch, backendFetchJson, getRestBase } from '../utils/api-rest';
14+
import { backendFetch, backendFetchJson, getRestBase } from '@gridsuite/commons-ui';
1515
import { LanguageParameters } from '../utils/language';
1616

1717
const PREFIX_CONFIG_QUERIES = `${getRestBase()}/config`;

src/services/directory.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
66
*/
77

8-
import { backendFetchJson, getRestBase } from '../utils/api-rest';
8+
import { backendFetchJson, getRestBase } from '@gridsuite/commons-ui';
99
import { UUID } from 'crypto';
1010

1111
const DIRECTORY_URL = `${getRestBase()}/directory/v1`;

src/services/explore.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
66
*/
77

8-
import { backendFetchJson, getRestBase } from '../utils/api-rest';
8+
import { backendFetchJson, getRestBase } from '@gridsuite/commons-ui';
99
import { UUID } from 'crypto';
1010

1111
const EXPLORE_URL = `${getRestBase()}/explore/v1`;

src/services/study.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,12 @@
55
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
66
*/
77

8-
import { backendFetchJson, getRestBase, Token } from '../utils/api-rest';
9-
import { getErrorMessage } from '../utils/error';
8+
import {
9+
backendFetchJson,
10+
getErrorMessage,
11+
getRestBase,
12+
Token,
13+
} from '@gridsuite/commons-ui';
1014
import { APP_NAME } from '../utils/config-params';
1115

1216
const STUDY_URL = `${getRestBase()}/study/v1`;

src/services/user-admin.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
66
*/
77

8-
import { backendFetch, backendFetchJson, getRestBase } from '../utils/api-rest';
9-
import { extractUserSub, getToken, getUser } from '../utils/api';
8+
import { backendFetch, backendFetchJson, getRestBase, getToken } from '@gridsuite/commons-ui';
9+
import { extractUserSub, getUser } from '../utils/api';
1010
import { User } from '../utils/auth';
1111
import { UUID } from 'crypto';
1212

src/utils/api-rest.ts

Lines changed: 0 additions & 91 deletions
This file was deleted.

src/utils/api.ts

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@ import { AppState } from '../redux/reducer';
99
import { store } from '../redux/store';
1010

1111
export type User = AppState['user'];
12-
export type Token = string;
13-
14-
export function getToken(user?: User): Token | null {
15-
return (user ?? getUser())?.id_token ?? null;
16-
}
1712

1813
export function getUser(): User {
1914
const state: AppState = store.getState();
@@ -36,11 +31,3 @@ export function extractUserSub(user: User): Promise<unknown> {
3631
}
3732
});
3833
}
39-
40-
export function parseError(text: string) {
41-
try {
42-
return JSON.parse(text);
43-
} catch (err) {
44-
return null;
45-
}
46-
}

src/utils/error.ts

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)