βββ README.md
```
-### [Change log](./CHANGELOG.md)
+
+### Mock data
+
+This project allows developers to develop in mock data with `npm run mock`, which means FEers can develop independently in the beginning of the project developing period. Developers can set mock data in `mock/fake/mock.js`, where supports two methods of creating mock data. The remote method relies on [faker.js](https://github.com/marak/Faker.js/).
+
### Git commit message rules
```
Also, run the script `npm run changelog` can generate all the `feat` and `fix` commits. Click [CHANGELOG.md](./CHANGELOG.md) shows all these commit histories.
+
+### [Change log](./CHANGELOG.md)
+
+
### Contributor
```
{
"/api": {
- "target": "http://localhost:3004",
+ "target": "http://localhost:3002",
"secure": false,
"logLevel": "debug",
"changeOrigin": true,
"lint": "ng lint",
"e2e": "ng e2e",
"mockproxy": "ng serve --host='0.0.0.0' --proxy-config localproxy.conf.json",
- "mockconfig": "node ./src/app/mock/server.js --port 3004",
+ "mockconfig": "node ./src/app/mock/server.js --port 3002",
"mock": "npm run mockconfig & npm run mockproxy",
"changelog": "conventional-changelog -p angular -i CHANGELOG.md -s"
},
<a routerLink="home">
<span title>
<i>
- <img src="{{ url === 'home' ? 'assets/images/home-icon-active.png':'assets/images/home-icon.png'}}" alt="home">
+ <img src="{{ url === 'home' ? 'assets/images/home-icon-active.png':'assets/images/home-icon.png'}}"
+ alt="home">
</i>
<span> {{"i18nTextDefine_Home" | translate}} </span>
</span>
<li nz-menu-item [ngClass]="{'activeMenuBar': url === 'management'}">
<a routerLink="management">
<span title>
- <i>
- <img src="{{url === 'management' ? 'assets/images/customer-icon-active.png':'assets/images/customer-icon.png'}}" alt="home">
+ <i>
+ <img
+ src="{{url === 'management' ? 'assets/images/customer-icon-active.png':'assets/images/customer-icon.png'}}"
+ alt="home">
</i>
<span> {{"i18nTextDefine_Customer" | translate}} </span>
</span>
<a routerLink="fcaps">
<span title>
<i>
- <img src="{{ url === 'fcaps' ? 'assets/images/monitor-icon-active.png':'assets/images/monitor-icon.png'}}" alt="home">
+ <img src="{{ url === 'fcaps' ? 'assets/images/monitor-icon-active.png':'assets/images/monitor-icon.png'}}"
+ alt="home">
</i>
<span> {{"i18nTextDefine_Monitor" | translate}} </span>
</span>
</li>
<hr>
<li nz-submenu [ngClass]="{'activeMenuBar': url.indexOf('services') === 0}" [nzOpen]="flag">
- <span title>
+ <span title>
<i>
- <img src="{{url.indexOf('services') === 0 ? 'assets/images/Services-icon-active.png':'assets/images/Services-icon.png'}}" alt="home">
- </i>
- {{"i18nTextDefine_Services" | translate}}
+ <img
+ src="{{url.indexOf('services') === 0 ? 'assets/images/Services-icon-active.png':'assets/images/Services-icon.png'}}"
+ alt="home">
+ </i>
+ {{"i18nTextDefine_Services" | translate}}
</span>
<ul>
<li nz-menu-item [ngClass]="{'activeMenuList': url === 'services/services-list'}">
<li nz-menu-item [ngClass]="{'activeMenuBar': url === 'network'}">
<a routerLink="network">
<span title>
- <i>
- <img src="{{url === 'network' ? 'assets/images/network-icon-active.png':'assets/images/network-icon.png'}}" alt="home">
+ <i>
+ <img
+ src="{{url === 'network' ? 'assets/images/network-icon-active.png':'assets/images/network-icon.png'}}"
+ alt="home">
</i>
<span> {{"i18nTextDefine_NetworkTopology" | translate}} </span>
</span>
+/*
+ Copyright (C) 2019 CMCC, Inc. and others. All rights reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+
+
+// left menu bar adaptation
@media screen and (min-width: 1200px){
.siderContent{
height:240px;
styleUrls: ['./app.component.less']
})
export class AppComponent {
- public url:string = 'home';
+ public url:string = 'home';
constructor(private translate: TranslateService,private myhttp: HomesService,private router:Router,) {
this.currentLanguageGet();
this.getUrl();
-
-
}
+
+ // Get the current routing path
getUrl(){
this.router.events.map(event=> {
if(event instanceof NavigationEnd){
}).subscribe(event=>{})
}
-
//209.05.08 Get the currentLanguage
currentloginId = null;
currentLanguage = "en";
currentLanguageGet() {
this.currentloginId = sessionStorage.getItem("userId") || null;
- console.log(this.currentloginId,"this.currentloginId","loginId");
if (this.currentloginId != null) {
- console.log(this.currentloginId,"this.currentloginId","loginId","you id");
this.myhttp.getCurrentLanguage(this.currentloginId)
.subscribe(
(data) => {
sessionStorage.setItem("DefaultLang",this.currentLanguage);
}
}
+
+ // Whether the submenu expands the identifier
get flag () {
if(!this.url.indexOf('services')){
return true
//The following APIs are optimizable
- // Get all customers
- getAllCustomers() {
- return this.http.get<any>(this.url.customers);
- }
- // Get all Orchestrators
- getAllOrchestrators() {
- return this.http.get<any>(this.url.orchestrators);
- }
- // serviceTable list
- getServicesTableData(paramsObj): Observable<HttpResponse<servicesTableData>> {
- let params = new HttpParams({ fromObject: paramsObj });
- return this.http.get<servicesTableData>(this.url.servicesTableData, { observe: 'response', params });
- }
- // Get all template types
- getAllServiceTemplates(type) {
- if (type == "Network Service") {
- let nsUrl = this.url.serviceTemplates.replace("service-templates", "listNsTemplates").replace("serviceTemplates2", "serviceTemplates-ns");
- console.log(nsUrl);
- return this.http.get<any>(nsUrl);
- }
- return this.http.get<any>(this.url.serviceTemplates);
- }
- // Get Vim Info
- getVimInfo() {
- return this.http.get<any>(this.url.vimInfo);
- };
- //Get SdnControllers
- getSdnControllers() {
- return this.http.get<any>(this.url.sdnControllers);
- }
- // Create interface
- createInstance(requestBody, createParams) {
- return this.http.post<any>(this.url.createService + createParams, requestBody);
- }
- // NS CreateInstance step one
- nsCreateInstance(requestBody) {
- return this.http.post<any>(this.url.ns_createService, requestBody);
- }
- // NS CreateInstance step two
- nsCreateInstance2(params, requestBody) {
- return this.http.post<any>(this.url.ns_createService2 + params, requestBody);
- }
- //Delete ns Service
- nsDeleteInstance(id) {
- return this.http.delete<any>(this.url.ns_deleteService + id);
- }
- //stop ns Service
- stopNsService(id, requestBody) { //You need to terminate before deleting
- return this.http.post<any>(this.url.ns_stopService + id, requestBody);
- }
- //heal ns Service
- healNsService(id, requestBody) {
- return this.http.post<any>(this.url.ns_healService + id, requestBody);
- }
- //Get allotted-resource to get tp and pnf values
- getAllottedResource(obj) {
- let params = new HttpParams({ fromObject: obj });
- let url = this.url.allottedResource;
- return this.http.get<any>(url, { params });
+ // Get all customers
+ getAllCustomers() {
+ return this.http.get<any>(this.url.customers);
+ }
+ // Get all Orchestrators
+ getAllOrchestrators() {
+ return this.http.get<any>(this.url.orchestrators);
+ }
+ // serviceTable list
+ getServicesTableData(paramsObj): Observable<HttpResponse<servicesTableData>> {
+ let params = new HttpParams({ fromObject: paramsObj });
+ return this.http.get<servicesTableData>(this.url.servicesTableData, { observe: 'response', params });
+ }
+ // Get all template types
+ getAllServiceTemplates(type) {
+ if (type == "Network Service") {
+ let nsUrl = this.url.serviceTemplates.replace("service-templates", "listNsTemplates").replace("serviceTemplates2", "serviceTemplates-ns");
+ console.log(nsUrl);
+ return this.http.get<any>(nsUrl);
}
+ return this.http.get<any>(this.url.serviceTemplates);
+ }
+ // Get Vim Info
+ getVimInfo() {
+ return this.http.get<any>(this.url.vimInfo);
+ };
+ //Get SdnControllers
+ getSdnControllers() {
+ return this.http.get<any>(this.url.sdnControllers);
+ }
+ // Create interface
+ createInstance(requestBody, createParams) {
+ return this.http.post<any>(this.url.createService + createParams, requestBody);
+ }
+ // NS CreateInstance step one
+ nsCreateInstance(requestBody) {
+ return this.http.post<any>(this.url.ns_createService, requestBody);
+ }
+ // NS CreateInstance step two
+ nsCreateInstance2(params, requestBody) {
+ return this.http.post<any>(this.url.ns_createService2 + params, requestBody);
+ }
+ //Delete ns Service
+ nsDeleteInstance(id) {
+ return this.http.delete<any>(this.url.ns_deleteService + id);
+ }
+ //stop ns Service
+ stopNsService(id, requestBody) { //You need to terminate before deleting
+ return this.http.post<any>(this.url.ns_stopService + id, requestBody);
+ }
+ //heal ns Service
+ healNsService(id, requestBody) {
+ return this.http.post<any>(this.url.ns_healService + id, requestBody);
+ }
+ //Get allotted-resource to get tp and pnf values
+ getAllottedResource(obj) {
+ let params = new HttpParams({ fromObject: obj });
+ let url = this.url.allottedResource;
+ return this.http.get<any>(url, { params });
+ }
//The following APIs are not optimizable ---------------------------------
@Injectable()
export class onboardService {
- constructor(private http: HttpClient) { }
+ constructor(private http: HttpClient) { }
- baseUrl = baseUrl.baseUrl + "/uui-lcm/";
- url = {
- //The following APIs are optimizable------------------------
- // list Data
- onboardTableData: this.baseUrl + "ns-packages",
- onboardDataVNF: this.baseUrl + "vnf-packages",
- onboardDataPNF: this.baseUrl + "pnf-packages",
- //ns sdc
- sdc_nsListData: this.baseUrl + "sdc-ns-packages", // GET
- // vnf sdc
- sdc_vnfListData: this.baseUrl + "sdc-vf-packages", // GET
- // onboard ns sdc data
- onboardNs: this.baseUrl + "ns-packages", //POST
- //onboard VNF sdc data
- onboardVNF: this.baseUrl + "vf-packages", //POST
- //Delete ns package
- deleteNspack: this.baseUrl + "deleteNsdPackage?nsdInfoId=",
- // Delete Vnf vfc package
- deleteVnfPack: this.baseUrl + "deleteVnfPackage?vnfPkgId=",
- // Delete Pnf package
- deletePnfPack: this.baseUrl + "deletePnfPackage?pnfdInfoId=",
- // The following APIs are not optimizable-------------------
- // createnspackages
- creatensData: this.baseUrl + "_jsonData", //POST
- //Progress interface
- progress: this.baseUrl + "jobs/" + "_jobId" + "?responseId="
- };
+ baseUrl = baseUrl.baseUrl + "/uui-lcm/";
+ url = {
+ //The following APIs are optimizable------------------------
+ // list Data
+ onboardTableData: this.baseUrl + "ns-packages",
+ onboardDataVNF: this.baseUrl + "vnf-packages",
+ onboardDataPNF: this.baseUrl + "pnf-packages",
+ //ns sdc
+ sdc_nsListData: this.baseUrl + "sdc-ns-packages", // GET
+ // vnf sdc
+ sdc_vnfListData: this.baseUrl + "sdc-vf-packages", // GET
+ // onboard ns sdc data
+ onboardNs: this.baseUrl + "ns-packages", //POST
+ //onboard VNF sdc data
+ onboardVNF: this.baseUrl + "vf-packages", //POST
+ //Delete ns package
+ deleteNspack: this.baseUrl + "deleteNsdPackage?nsdInfoId=",
+ // Delete Vnf vfc package
+ deleteVnfPack: this.baseUrl + "deleteVnfPackage?vnfPkgId=",
+ // Delete Pnf package
+ deletePnfPack: this.baseUrl + "deletePnfPackage?pnfdInfoId=",
+ // The following APIs are not optimizable-------------------
+ // createnspackages
+ creatensData: this.baseUrl + "_jsonData", //POST
+ //Progress interface
+ progress: this.baseUrl + "jobs/" + "_jobId" + "?responseId="
+ };
- //The following APIs function are optimizable------------------------
+ //The following APIs function are optimizable------------------------
/* Query data list */
// NS Data
getOnboardTableData() {
- return this.http.get<any>(this.url["onboardTableData"]);
+
return this.http.get<any>(this.url["onboardTableData"]);
}
// NS SDC Data
getSDC_NSTableData() {
- return this.http.get<any>(this.url["sdc_nsListData"]);
+
return this.http.get<any>(this.url["sdc_nsListData"]);
}
// VNF Data
getOnboardTableVnfData() {
- return this.http.get<any>(this.url.onboardDataVNF);
+
return this.http.get<any>(this.url.onboardDataVNF);
}
// onboard VNF sdc Data
getSDC_VNFTableData() {
- return this.http.get<any>(this.url["sdc_vnfListData"]);
+
return this.http.get<any>(this.url["sdc_vnfListData"]);
}
// PNF Data
getOnboardTablePnfData() {
- return this.http.get<any>(this.url.onboardDataPNF);
+
return this.http.get<any>(this.url.onboardDataPNF);
}
//onboard sdc ns
getNsonboard(requestBody) {
//create--Get the id after dragging the file before uploading
getCreatensData(url_upId, requestBody) {
- return this.http.post<any>(this.url.creatensData.replace("_jsonData", url_upId), requestBody);
+
return this.http.post<any>(this.url.creatensData.replace("_jsonData", url_upId), requestBody);
}
//onboard progress
getProgress(jobid, responseId) {
- let url = this.url.progress.replace("_jobId", jobid) + responseId;
- return this.http.get<any>(url);
+ let url = this.url.progress.replace("_jobId", jobid) + responseId;
+
return this.http.get<any>(url);
}
}
+++ /dev/null
-import { TestBed, inject } from '@angular/core/testing';
-
-import { TextService } from './text.service';
-
-describe('TextService', () => {
- beforeEach(() => {
- TestBed.configureTestingModule({
- providers: [TextService]
- });
- });
-
- it('should be created', inject([TextService], (service: TextService) => {
- expect(service).toBeTruthy();
- }));
-});
export class TextService {
constructor(private http: HttpClient) { }
//---------------------------------------------------------------------------------------
- /* line up*/
baseUrl = "/api";
+
url = {
textInterface: this.baseUrl + "/user/login",
singleInterface: this.baseUrl + "/home",
doubleInterface: this.baseUrl + "/customer/info",
- multipleInterface: this.baseUrl + "/alarm/formdata/multiple",
+ multipleInterface: this.baseUrl + "/alarm/form/data",
jsonInterface: this.baseUrl + "/xuran/test/data",
+ currentLanguage: "/api/portal-auxapi/languageSetting/user/",
+ creatensData: this.baseUrl + "_jsonData", //POST
}
//-----------------------------------Function-local-start------------------------------------------------------
getfakeData() {
return this.http.get<any>(this.url["singleInterface"]);
}
- getjsonData() {
- return this.http.get<any>(this.url["multipleInterface"]);
+ getjsonData(user) {
+ return this.http.get<any>(this.url["multipleInterface"], user);
+ }
+ getCurrentLanguage(currentloginId) {
+ let url = this.url.currentLanguage + currentloginId;
+ return this.http.get<any>(url);
+ }
+ getCreatensData(url_upId: string, requestBody: object) {
+ return this.http.post<any>(this.url.creatensData.replace("_jsonData", url_upId), requestBody);
}
//-------------------------------------------------------------------------------------
avatar: faker.internet.avatar()
}
}),
+ language: { language: faker.random.locale() }
}
\ No newline at end of file
module.exports = {
//Mock json
'customer_info': fakeData.customer,
- 'alarm_formdata_multiple': fakeData,
+ 'alarm_formdata_multiple': fakeData.customer,
'home': fakeData.home,
+ 'language': fakeData.language,
}
\ No newline at end of file
--- /dev/null
+{
+ "language": "en"
+}
\ No newline at end of file
--- /dev/null
+{
+ "esr-system-info-id": "xuran",
+ "service-url": "http://10.10.10.10:8080/",
+ "user-name": "demo",
+ "password": "demo123456!",
+ "system-type": "ONAP",
+ "resource-version": "1536221798873"
+}
\ No newline at end of file
// proxy routers setting
module.exports =
{
+ //text interface
+ "/user/login/:user/test": "/user/login?user=:user",
+ "/pnf/:cloudnode/p-interfaces/p-interface/:interface-name/createTerminationPoint":
+ "/status",
+ "/alarm/form/data": "/alarm_form_data",
+ "/upload/:url_upId": "/status",
+ ///////////////
+ ///////<-------------home services--------->/////
+ "/portal-auxapi/languageSetting/user/:currentloginId": "/language",
+ /////////////////////////
+ ///////<-------------managemence services--------->/////
+
+ /////////////////////////
+ ///////<-------------myhttp services--------->/////
+
+ /////////////////////////
+ ///////<-------------networkhttp services--------->/////
+
+ /////////////////////////
+ ///////<-------------onboard services--------->/////
+
+ /////////////////////////
+
+ ///////<-------------general interface--------->/////
"/api/*": "/$1",
"/*/*": "/$1_$2",
"/*/*/*": "/$1_$2_$3",
"/*/*/*/*": "/$1_$2_$3_$4",
+ /////////////////////////
}
const jsonServer = require('json-server');
const server = jsonServer.create();
const middlewares = jsonServer.defaults();
-// const customersRouters = require('./routes');
+const customersRouters = require('./routes');
// Set default middlewares (logger, static, cors and no-cache)
server.use(middlewares);
function fileDisplay(filePath) {
let fileList = [];
- let originPath = [];
- let rewriter = {};
+ // let originPath = [];
+ // let rewriter = {};
// Return filelist on based of filePath
const files = fs.readdirSync(filePath);
files.forEach((filename) => {
if (isFile) {
fileList.push(path.basename(filedir, '.json'));
fileList.forEach(item => {
- let paser = item.split("_").join("/");
- originPath.push({ route: `/${paser}`, origin: `/${item}` })
- originPath.map(route => {
- rewriter[route.route] = route.origin;
- })
+ // let paser = item.split("_").join("/");
+ // originPath.push({ route: `/${paser}`, origin: `/${item}` })
+ // originPath.map(route => {
+ // rewriter[route.route] = route.origin;
+ // })
localJsonDb[item] = getjsonContent(item);
})
}
})
})
setTimeout(() => {
- serverRewrite(rewriter);
+ // serverRewrite(rewriter);
+ serverRewrite();
runServer(localJsonDb);
}, 100)
}
}
//only multi router data needs jsonServer.rewriter
-function serverRewrite(routerpath) {
- let routerpathArr = routerpath;
- //rewrite mock multiple routers here
- Object.keys(fakeoriginalData).map(item => {
- let newPath = item.split("_").join("/")
- routerpathArr[`/${newPath}`] = `/${item}`;
- })
+function serverRewrite() {
+ // let routerpathArr = routerpath;
+ // rewrite mock multiple routers here
+ // Object.keys(fakeoriginalData).map(item => {
+ // let newPath = item.split("_").join("/")
+ // routerpathArr[`/${newPath}`] = `/${item}`;
+ // })
//start to rewrite routers
- // console.log(customersRouters, "===customersRouters")
- // server.use(jsonServer.rewriter(customersRouters))
- server.use(jsonServer.rewriter(routerpathArr));
+ server.use(jsonServer.rewriter(customersRouters))
+ // server.use(jsonServer.rewriter(routerpathArr));
}
function runServer(db) {
server.use(jsonServer.router(db));
}
-server.listen(3004, () => {
- console.log('Mock Server is successfully running on port 3004 π')
+server.listen(3002, () => {
+ console.log('Mock Server is successfully running on port 3002 π')
});
<td>{{data.phone}}</td>
<td>{{data.address}}</td>
<td>
- <a>Action δΈ {{data.name}}</a>
+ <a>Action</a>
<nz-divider nzType="vertical"></nz-divider>
<a>Delete</a>
</td>
ngOnInit() {
this.getMockData();
this.getjsonData();
+ this.getCurrentLanguage();
+ this.createPostData();
}
tableData = []
})
}
getjsonData() {
- this.TextService.getjsonData().subscribe(res => {
+ this.TextService.getjsonData("xuran").subscribe(res => {
console.log(res, "======json data")
})
}
+ getCurrentLanguage() {
+ this.TextService.getCurrentLanguage(10).subscribe(res => {
+ console.log(res, "======> current language")
+ })
+ }
+ createPostData() {
+ this.TextService.getCreatensData("/upload/name", { user: "xuran" }).subscribe(res => {
+ console.log(res, "======> post data")
+ })
+ }
+
}
Code Review / usecase-ui.git / commitdiff