Skip to content

Commit

Permalink
Rename ui server files
Browse files Browse the repository at this point in the history
Signed-off-by: freddidierRTE <[email protected]>
  • Loading branch information
freddidierRTE authored and vlo-rte committed Jan 24, 2025
1 parent 6e6a4e5 commit d0c636f
Show file tree
Hide file tree
Showing 98 changed files with 162 additions and 162 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import {ProcessesService} from '@ofServices/processes/ProcessesService';
import {UserPermissionsService} from '@ofServices/userPermissions/UserPermissionsService';
import {UsersService} from '@ofServices/users/UsersService';
import {Subject, map, takeUntil} from 'rxjs';
import {ServerResponseStatus} from 'app/business/server/serverResponse';
import {ServerResponseStatus} from 'app/server/ServerResponse';
import {AlertMessageService} from '@ofServices/alerteMessage/AlertMessageService';
import {OpfabStore} from '../../../../store/opfabStore';
import {RoleEnum} from '@ofServices/entities/model/RoleEnum';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import {UserPermissionsService} from '@ofServices/userPermissions/UserPermission
import {UsersService} from '@ofServices/users/UsersService';
import {Subject} from 'rxjs';
import {CardsService} from '@ofServices/cards/CardsService';
import {ServerResponseStatus} from 'app/business/server/serverResponse';
import {ServerResponseStatus} from 'app/server/ServerResponse';
import {LoggerService} from 'app/services/logs/LoggerService';
import {ModalService} from '@ofServices/modal/ModalService';
import {I18n} from 'app/model/I18n';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {ExternalDevicesService} from '@ofServices/notifications/ExternalDevicesS
import {ModalService} from '@ofServices/modal/ModalService';
import {I18n} from 'app/model/I18n';
import {ExternaldevicesModalComponent} from '../editModal/externaldevices-modal.component';
import {ServerResponseStatus} from 'app/business/server/serverResponse';
import {ServerResponseStatus} from 'app/server/ServerResponse';
import {NgIf} from '@angular/common';
import {TranslateModule} from '@ngx-translate/core';
import {SpinnerComponent} from '../../share/spinner/spinner.component';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import {GroupedLightCardsService} from '@ofServices/groupedLightCards/GroupedLig
import {AlertMessageService} from '@ofServices/alerteMessage/AlertMessageService';
import {UserPreferencesService} from '@ofServices/userPreferences/UserPreferencesService';
import {LoggerService as logger} from 'app/services/logs/LoggerService';
import {ServerResponseStatus} from 'app/business/server/serverResponse';
import {ServerResponseStatus} from 'app/server/ServerResponse';
import {FilteredLightCardsStore} from '../../../../store/lightcards/lightcards-feed-filter-store';
import {OpfabStore} from '../../../../store/opfabStore';
import {RoleEnum} from '@ofServices/entities/model/RoleEnum';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {SettingsView} from 'app/views/settings/settings.view';
import {FormControl, FormGroup, Validators, FormsModule, ReactiveFormsModule} from '@angular/forms';
import {MultiSelectConfig} from 'app/components/share/multi-select/model/MultiSelect';
import {Subject, takeUntil} from 'rxjs';
import {ServerResponseStatus} from 'app/business/server/serverResponse';
import {ServerResponseStatus} from 'app/server/ServerResponse';
import {ModalService} from '@ofServices/modal/ModalService';
import {I18n} from 'app/model/I18n';
import {AlertMessageService} from '@ofServices/alerteMessage/AlertMessageService';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2023-2024, RTE (http://www.rte-france.com)
/* Copyright (c) 2023-2025, RTE (http://www.rte-france.com)
* See AUTHORS.txt
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
Expand All @@ -7,7 +7,7 @@
* This file is part of the OperatorFabric project.
*/

import {ServerResponse, ServerResponseStatus} from 'app/business/server/serverResponse';
import {ServerResponse, ServerResponseStatus} from 'app/server/ServerResponse';
import {catchError, map, Observable, of} from 'rxjs';

export class AngularServer {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2023-2024, RTE (http://www.rte-france.com)
/* Copyright (c) 2023-2025, RTE (http://www.rte-france.com)
* See AUTHORS.txt
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2018-2024, RTE (http://www.rte-france.com)
/* Copyright (c) 2018-2025, RTE (http://www.rte-france.com)
* See AUTHORS.txt
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import {UsersService} from '../users/UsersService';
import {UsersServerMock} from '@tests/mocks/UsersServer.mock';
import {EntitiesServerMock} from '@tests/mocks/entitiesServer.mock';
import {Entity} from '@ofServices/entities/model/Entity';
import {ServerResponse, ServerResponseStatus} from '../../business/server/serverResponse';
import {ServerResponse, ServerResponseStatus} from '../../server/ServerResponse';
import {ProcessesService} from '../processes/ProcessesService';
import {PermissionEnum} from '@ofServices/groups/model/PermissionEnum';
import {RoleEnum} from '@ofServices/entities/model/RoleEnum';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {UserWithPerimeters} from '@ofServices/users/model/UserWithPerimeters';
import {Card} from 'app/model/Card';
import {Observable} from 'rxjs';
import {AcknowledgeServer} from './server/AcknowledgeServer';
import {ServerResponse} from '../../business/server/serverResponse';
import {ServerResponse} from '../../server/ServerResponse';
import {UserPermissionsService} from '@ofServices/userPermissions/UserPermissionsService';
import {PermissionEnum} from '@ofServices/groups/model/PermissionEnum';
import {ProcessesService} from '../processes/ProcessesService';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2023-2024, RTE (http://www.rte-france.com)
/* Copyright (c) 2023-2025, RTE (http://www.rte-france.com)
* See AUTHORS.txt
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
Expand All @@ -8,7 +8,7 @@
*/

import {Observable} from 'rxjs';
import {ServerResponse} from '../../../business/server/serverResponse';
import {ServerResponse} from '../../../server/ServerResponse';

export abstract class AcknowledgeServer {
abstract postUserAcknowledgement(cardUid: string, entitiesAcks: string[]): Observable<ServerResponse<void>>;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2018-2024, RTE (http://www.rte-france.com)
/* Copyright (c) 2018-2025, RTE (http://www.rte-france.com)
* See AUTHORS.txt
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
Expand All @@ -11,9 +11,9 @@ import {Injectable} from '@angular/core';
import {Observable} from 'rxjs';
import {HttpClient} from '@angular/common/http';
import {environment} from '@env/environment';
import {AngularServer} from '../../../server/angular.server';
import {AngularServer} from '../../../server/AngularServer';
import {AcknowledgeServer} from '@ofServices/acknowlegment/server/AcknowledgeServer';
import {ServerResponse} from 'app/business/server/serverResponse';
import {ServerResponse} from 'app/server/ServerResponse';

@Injectable({
providedIn: 'root'
Expand Down
2 changes: 1 addition & 1 deletion ui/main/src/app/services/admin/AdminProcessesService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {Observable} from 'rxjs';
import {map} from 'rxjs/operators';
import {Process} from '@ofServices/processes/model/Processes';
import {AdminProcessesServer} from './server/AdminProcessesServer';
import {ServerResponseStatus} from '../../business/server/serverResponse';
import {ServerResponseStatus} from '../../server/ServerResponse';
import {AlertMessageService} from '@ofServices/alerteMessage/AlertMessageService';
import {MessageLevel} from '@ofServices/alerteMessage/model/Message';
import {LoggerService} from '@ofServices/logs/LoggerService';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

import {map, takeUntil, tap} from 'rxjs/operators';
import {Observable, Subject} from 'rxjs';
import {ServerResponseStatus} from '../../business/server/serverResponse';
import {ServerResponseStatus} from '../../server/ServerResponse';
import {SupervisedEntity} from '@ofServices/admin/model/SupervisedEntity';
import {SupervisedEntitiesServer} from '@ofServices/admin/server/SupervisedEntitiesServer';
import {LoggerService as logger} from 'app/services/logs/LoggerService';
Expand Down
4 changes: 2 additions & 2 deletions ui/main/src/app/services/admin/server/AdminProcessesServer.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2023-2024, RTE (http://www.rte-france.com)
/* Copyright (c) 2023-2025, RTE (http://www.rte-france.com)
* See AUTHORS.txt
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
Expand All @@ -9,7 +9,7 @@

import {Process} from '@ofServices/processes/model/Processes';
import {Observable} from 'rxjs';
import {ServerResponse} from '../../../business/server/serverResponse';
import {ServerResponse} from '../../../server/ServerResponse';

export abstract class AdminProcessesServer {
abstract deleteById(id: string): Observable<ServerResponse<any>>;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2023-2024, RTE (http://www.rte-france.com)
/* Copyright (c) 2023-2025, RTE (http://www.rte-france.com)
* See AUTHORS.txt
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
Expand All @@ -12,8 +12,8 @@ import {HttpClient} from '@angular/common/http';
import {environment} from '@env/environment';
import {Observable} from 'rxjs';
import {Process} from '@ofServices/processes/model/Processes';
import {AngularServer} from '../../../server/angular.server';
import {ServerResponse} from 'app/business/server/serverResponse';
import {AngularServer} from '../../../server/AngularServer';
import {ServerResponse} from 'app/server/ServerResponse';
import {AdminProcessesServer} from '@ofServices/admin/server/AdminProcessesServer';

@Injectable({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2023-2024, RTE (http://www.rte-france.com)
/* Copyright (c) 2023-2025, RTE (http://www.rte-france.com)
* See AUTHORS.txt
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
Expand All @@ -12,8 +12,8 @@ import {HttpClient} from '@angular/common/http';
import {Observable} from 'rxjs';
import {SupervisedEntity} from '@ofServices/admin/model/SupervisedEntity';
import {Injectable} from '@angular/core';
import {ServerResponse} from 'app/business/server/serverResponse';
import {AngularServer} from '../../../server/angular.server';
import {ServerResponse} from 'app/server/ServerResponse';
import {AngularServer} from '../../../server/AngularServer';
import {SupervisedEntitiesServer} from './SupervisedEntitiesServer';

@Injectable({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2023-2024, RTE (http://www.rte-france.com)
/* Copyright (c) 2023-2025, RTE (http://www.rte-france.com)
* See AUTHORS.txt
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
Expand All @@ -8,7 +8,7 @@
*/

import {Observable} from 'rxjs';
import {ServerResponse} from '../../../business/server/serverResponse';
import {ServerResponse} from '../../../server/ServerResponse';
import {SupervisedEntity} from '@ofServices/admin/model/SupervisedEntity';

export abstract class SupervisedEntitiesServer {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import {OpfabStore} from '../../store/opfabStore';
import {ApplicationUpdateService} from '../events/ApplicationUpdateService';
import {SystemNotificationService} from '../notifications/SystemNotificationService';
import {ApplicationLoadingComponent} from './ApplicationLoadingComponent';
import {ServerResponseStatus} from '../../business/server/serverResponse';
import {ServerResponseStatus} from '../../server/ServerResponse';
import {Utilities} from '../../utils/utilities';
import {ModalService} from '../modal/ModalService';
import {SessionManagerService} from '../sessionManager/SessionManagerService';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

import {firstValueFrom, map, Observable} from 'rxjs';
import {BusinessDataServer} from './server/BusinessDataServer';
import {ServerResponseStatus} from '../../business/server/serverResponse';
import {ServerResponseStatus} from '../../server/ServerResponse';
import {LogOption, LoggerService as logger} from 'app/services/logs/LoggerService';
import {OpfabEventStreamService} from '../events/OpfabEventStreamService';
import * as _ from 'lodash-es';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2023-2024, RTE (http://www.rte-france.com)
/* Copyright (c) 2023-2025, RTE (http://www.rte-france.com)
* See AUTHORS.txt
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
Expand All @@ -11,9 +11,9 @@ import {HttpClient} from '@angular/common/http';
import {Injectable} from '@angular/core';
import {environment} from '@env/environment';
import {BusinessDataServer} from '@ofServices/businessdata/server/BusinessDataServer';
import {ServerResponse} from 'app/business/server/serverResponse';
import {ServerResponse} from 'app/server/ServerResponse';
import {Observable} from 'rxjs';
import {AngularServer} from '../../../server/angular.server';
import {AngularServer} from '../../../server/AngularServer';

@Injectable({
providedIn: 'root'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2023-2024, RTE (http://www.rte-france.com)
/* Copyright (c) 2023-2025, RTE (http://www.rte-france.com)
* See AUTHORS.txt
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
Expand All @@ -8,7 +8,7 @@
*/

import {Observable} from 'rxjs';
import {ServerResponse} from '../../../business/server/serverResponse';
import {ServerResponse} from '../../../server/ServerResponse';

export abstract class BusinessDataServer {
abstract deleteById(id: string): Observable<ServerResponse<any>>;
Expand Down
2 changes: 1 addition & 1 deletion ui/main/src/app/services/cardResponse/CardResponse.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {Process, State} from '@ofServices/processes/model/Processes';
import {User} from '@ofServices/users/model/User';
import {UserWithPerimeters} from '@ofServices/users/model/UserWithPerimeters';
import {getOneCard, setEntities, setProcessConfiguration, setUserPerimeter} from '@tests/helpers';
import {ServerResponse, ServerResponseStatus} from 'app/business/server/serverResponse';
import {ServerResponse, ServerResponseStatus} from 'app/server/ServerResponse';
import {CardResponseService} from './CardResponseService';
import {CardsService} from '@ofServices/cards/CardsService';
import {CardsServerMock} from '@tests/mocks/CardsServer.mock';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {ProcessesService} from '@ofServices/processes/ProcessesService';
import {CardTemplateGateway} from '@ofServices/templateGateway/CardTemplateGateway';
import {UserPermissionsService} from '@ofServices/userPermissions/UserPermissionsService';
import {UsersService} from '@ofServices/users/UsersService';
import {ServerResponseStatus} from 'app/business/server/serverResponse';
import {ServerResponseStatus} from 'app/server/ServerResponse';
import {CardsService} from '@ofServices/cards/CardsService';

export class CardResponseService {
Expand Down
2 changes: 1 addition & 1 deletion ui/main/src/app/services/cards/CardsService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {map} from 'rxjs/operators';
import {I18n} from 'app/model/I18n';
import {CardsFilter} from '@ofServices/cards/model/CardsFilter';
import {CardsServer} from './server/CardsServer';
import {ServerResponse, ServerResponseStatus} from '../../business/server/serverResponse';
import {ServerResponse, ServerResponseStatus} from '../../server/ServerResponse';
import {AcknowledgeService} from '../acknowlegment/AcknowledgeService';
import {Card} from 'app/model/Card';
import {FieldToTranslate} from './model/FieldToTranslate';
Expand Down
4 changes: 2 additions & 2 deletions ui/main/src/app/services/cards/server/AngularCardsServer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
* This file is part of the OperatorFabric project.
*/

import {ServerResponse} from 'app/business/server/serverResponse';
import {ServerResponse} from 'app/server/ServerResponse';

import {Observable} from 'rxjs';
import {AngularServer} from '../../../server/angular.server';
import {AngularServer} from '../../../server/AngularServer';
import {HttpClient} from '@angular/common/http';
import {environment} from '@env/environment';
import {Injectable} from '@angular/core';
Expand Down
2 changes: 1 addition & 1 deletion ui/main/src/app/services/cards/server/CardsServer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {CardForPublishing} from '../model/CardForPublishing';
import {CardCreationReportData} from '../model/CardCreationReportData';
import {FieldToTranslate} from '@ofServices/cards/model/FieldToTranslate';
import {Observable} from 'rxjs';
import {ServerResponse} from '../../../business/server/serverResponse';
import {ServerResponse} from '../../../server/ServerResponse';
import {Card} from 'app/model/Card';

export abstract class CardsServer {
Expand Down
4 changes: 2 additions & 2 deletions ui/main/src/app/services/config/ConfigService.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2023-2024, RTE (http://www.rte-france.com)
/* Copyright (c) 2023-2025, RTE (http://www.rte-france.com)
* See AUTHORS.txt
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
Expand All @@ -10,7 +10,7 @@
import {ConfigServerMock} from '@tests/mocks/configServer.mock';
import {ConfigService} from './ConfigService';
import {firstValueFrom} from 'rxjs';
import {ServerResponse, ServerResponseStatus} from 'app/business/server/serverResponse';
import {ServerResponse, ServerResponseStatus} from 'app/server/ServerResponse';
describe('ConfigService', () => {
let configServerMock: ConfigServerMock;

Expand Down
2 changes: 1 addition & 1 deletion ui/main/src/app/services/config/ConfigService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {Locale} from '@ofServices/config/model/Locale';
import {UIMenuFile} from '@ofServices/config/model/UIMenuFile';
import {ConfigServer} from './server/ConfigServer';
import {MonitoringConfig} from './model/MonitoringConfig';
import {ServerResponseStatus} from '../../business/server/serverResponse';
import {ServerResponseStatus} from '../../server/ServerResponse';
import {LoggerService} from 'app/services/logs/LoggerService';
import {ProcessMonitoringConfig} from './model/ProcessMonitoringConfig';

Expand Down
4 changes: 2 additions & 2 deletions ui/main/src/app/services/config/server/AngularConfigServer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ import {environment} from '@env/environment';
import {UIMenuFile} from '@ofServices/config/model/UIMenuFile';
import {MonitoringConfig} from '../model/MonitoringConfig';
import {RealTimeScreens} from '../model/RealTimeScreensConfig';
import {ServerResponse} from 'app/business/server/serverResponse';
import {ServerResponse} from 'app/server/ServerResponse';
import {map, Observable} from 'rxjs';
import {ConfigServer} from './ConfigServer';
import {AngularServer} from 'app/server/angular.server';
import {AngularServer} from 'app/server/AngularServer';
import {LoggerService as logger} from 'app/services/logs/LoggerService';
import {ProcessMonitoringConfig} from '../model/ProcessMonitoringConfig';

Expand Down
4 changes: 2 additions & 2 deletions ui/main/src/app/services/config/server/ConfigServer.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2023-2024, RTE (http://www.rte-france.com)
/* Copyright (c) 2023-2025, RTE (http://www.rte-france.com)
* See AUTHORS.txt
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
Expand All @@ -10,7 +10,7 @@
import {MonitoringConfig} from '../model/MonitoringConfig';
import {RealTimeScreens} from '../model/RealTimeScreensConfig';
import {Observable} from 'rxjs';
import {ServerResponse} from '../../../business/server/serverResponse';
import {ServerResponse} from '../../../server/ServerResponse';
import {ProcessMonitoringConfig} from '../model/ProcessMonitoringConfig';

export abstract class ConfigServer {
Expand Down
2 changes: 1 addition & 1 deletion ui/main/src/app/services/entities/EntitiesService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {map, takeUntil, tap} from 'rxjs/operators';
import {Observable, Subject} from 'rxjs';
import {Entity} from './model/Entity';
import {EntitiesServer} from './server/EntitiesServer';
import {ServerResponseStatus} from '../../business/server/serverResponse';
import {ServerResponseStatus} from '../../server/ServerResponse';
import {LoggerService as logger} from 'app/services/logs/LoggerService';
import {RoleEnum} from './model/RoleEnum';
import {EntitiesTree} from './model/EntitiesTree';
Expand Down
Loading

0 comments on commit d0c636f

Please sign in to comment.