[develop]: Remove mining route and dependency.
This commit is contained in:
parent
e290015c82
commit
7cee4742b1
|
|
@ -3,4 +3,3 @@ node_modules/
|
|||
dist/
|
||||
.idea/
|
||||
package-lock.json
|
||||
interactiveminingv3.tgz
|
||||
|
|
|
|||
|
|
@ -45,16 +45,13 @@
|
|||
"src/.htaccess"
|
||||
],
|
||||
"styles": [
|
||||
"src/mining.scss",
|
||||
"src/styles.less",
|
||||
"src/assets/common-assets/library-css/material.scss"
|
||||
],
|
||||
"scripts": [
|
||||
"node_modules/uikit/dist/js/uikit.min.js",
|
||||
"node_modules/uikit/dist/js/uikit-icons.min.js",
|
||||
"node_modules/jquery/dist/jquery.js",
|
||||
"node_modules/interactiveminingv3/assets/js/ResizeSensor.js",
|
||||
"node_modules/interactiveminingv3/assets/js/jquery.sticky-sidebar.js"
|
||||
"node_modules/jquery/dist/jquery.js"
|
||||
],
|
||||
"vendorChunk": true,
|
||||
"extractLicenses": false,
|
||||
|
|
|
|||
|
|
@ -1,14 +0,0 @@
|
|||
rm -f interactiveminingv3.tgz
|
||||
git clone https://code-repo.d4science.org/MaDgIK/interactive-mining.git
|
||||
cd interactive-mining/
|
||||
git checkout angular-16
|
||||
cd interactive-mining-angular-frontend/
|
||||
npm install
|
||||
npm run packagr
|
||||
cp -r ./src/assets/ ./dist
|
||||
cd dist/
|
||||
npm pack
|
||||
mv interactiveminingv3-1.0.0.tgz ../../../interactiveminingv3.tgz
|
||||
cd ../../../
|
||||
rm -rf interactive-mining/
|
||||
npm install --no-save ./interactiveminingv3.tgz
|
||||
|
|
@ -11,8 +11,6 @@
|
|||
"webpack-bundle-analyzer": "ng build --stats-json && webpack-bundle-analyzer dist/monitor-dashboard/browser/stats.json --host 0.0.0.0",
|
||||
"test": "ng test",
|
||||
"e2e": "ng e2e",
|
||||
"mining": "chmod +x interactivemining-install.sh && ./interactivemining-install.sh",
|
||||
"postinstall": "npm run mining",
|
||||
"after-build-clean": "rm -rf dist/connect-admin/assets/common-assets/.git dist/connect-admin/assets/openaire-theme/.git .angular"
|
||||
},
|
||||
"private": true,
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@ import {ConnectHelper} from './openaireLibrary/connect/connectHelper';
|
|||
import {ConfigurationService} from './openaireLibrary/utils/configuration/configuration.service';
|
||||
import {StringUtils} from "./openaireLibrary/utils/string-utils.class";
|
||||
import {OpenaireEntities} from "./openaireLibrary/utils/properties/searchFields";
|
||||
import {mining} from "./openaireLibrary/utils/icons/icons";
|
||||
|
||||
@Component({
|
||||
selector: 'app-root',
|
||||
|
|
@ -138,9 +137,6 @@ export class AppComponent implements OnInit {
|
|||
this.subscriptions.push(this.userManagementService.getUserInfo().subscribe(user => {
|
||||
if (user) {
|
||||
this.user = user;
|
||||
localStorage.setItem('user_id', this.user.id);
|
||||
localStorage.setItem('mining_backend_address', this.properties.miningBackendURL);
|
||||
localStorage.setItem('isCommunityManager', Session.isCommunityCurator(this.user) + '');
|
||||
this.buildMenu();
|
||||
} else if(this.user) {
|
||||
this.user = user;
|
||||
|
|
@ -242,9 +238,6 @@ export class AppComponent implements OnInit {
|
|||
this.sideBarItems.push(new MenuItem("users", "Users", "", "/" + this.community.communityId + "/users", false, [], [], {}, {name: 'group'}, null, null, "/" + this.community.communityId + "/users"));
|
||||
this.sideBarItems.push(new MenuItem("admin-tools", "Pages & Menus", "", "/" + this.community.communityId + "/admin-tools/pages", false, [], [], {}, {name: 'description'}, null, null, "/" + this.community.communityId + "/admin-tools"));
|
||||
this.sideBarItems.push(new MenuItem("customization", "Customization", "", "/" + this.community.communityId + "/customize-layout", false, [], [], {}, {name: 'brush'}));
|
||||
if (this.community.type === 'ri') {
|
||||
this.sideBarItems.push(new MenuItem("mining", "Mining", "", "/" + this.community.communityId + "/mining/manage-profiles", false, [], [], {}, {svg: mining.data}, null, null, "/" + this.community.communityId + "/mining"));
|
||||
}
|
||||
this.backItem = new MenuItem("back", "Manage Communities", "", "/", false, [], null, {}, {name: 'west'});
|
||||
|
||||
this.menuItems = [];
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@ import {ErrorInterceptorService} from "./openaireLibrary/error-interceptor.servi
|
|||
import {DEFAULT_TIMEOUT, TimeoutInterceptor} from "./openaireLibrary/timeout-interceptor.service";
|
||||
import {AdminLoginGuard} from "./openaireLibrary/login/adminLoginGuard.guard";
|
||||
import {LoginGuard} from "./openaireLibrary/login/loginGuard.guard";
|
||||
import {InteractiveMiningModule} from 'interactiveminingv3';
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
|
|
@ -32,7 +31,6 @@ import {InteractiveMiningModule} from 'interactiveminingv3';
|
|||
BottomModule, NavigationBarModule,
|
||||
ErrorModule,
|
||||
SharedModule,
|
||||
InteractiveMiningModule,
|
||||
BrowserAnimationsModule, LoadingModule, SideBarModule
|
||||
],
|
||||
declarations: [
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 503ab40616c53a071cd74fb2802cd3de130923f6
|
||||
Subproject commit 5f29422d9076ce6e58bc1abdb2f5ffbf35bd4bde
|
||||
|
|
@ -16,11 +16,6 @@ import {ConnectRIGuard} from "../openaireLibrary/connect/communityGuard/connectR
|
|||
path: 'users',
|
||||
loadChildren: () => import('./users/users-routing.module').then(m => m.UsersRoutingModule)
|
||||
},
|
||||
{
|
||||
path: 'mining',
|
||||
loadChildren: () => import('./mining/mining.module').then(m => m.MiningModule),
|
||||
canActivateChild: [ConnectRIGuard]
|
||||
},
|
||||
{
|
||||
path: 'admin-tools',
|
||||
loadChildren: () => import('./admin-tools/admin-tools-routing.module').then(m => m.AdminToolsRoutingModule),
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
import {NgModule} from "@angular/core";
|
||||
import {InteractiveMiningModule, InteractiveMiningRoutingModule} from "interactiveminingv3";
|
||||
|
||||
@NgModule({
|
||||
imports: [InteractiveMiningRoutingModule, InteractiveMiningModule]
|
||||
})
|
||||
export class MiningRoutingModule {
|
||||
|
||||
}
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
import {Component, OnDestroy, OnInit} from "@angular/core";
|
||||
import {ActivatedRoute} from "@angular/router";
|
||||
import {Title} from "@angular/platform-browser";
|
||||
import {Subscription} from "rxjs";
|
||||
|
||||
@Component({
|
||||
selector: 'mining',
|
||||
template: `
|
||||
<div page-content>
|
||||
<div inner>
|
||||
<div class="mining uk-section">
|
||||
<router-outlet></router-outlet>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
`
|
||||
})
|
||||
export class MiningComponent implements OnInit, OnDestroy{
|
||||
private subs: any[] = [];
|
||||
|
||||
constructor(private title: Title,
|
||||
private route: ActivatedRoute) {
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
this.subs.push(this.route.params.subscribe(params => {
|
||||
this.title.setTitle(params['community'].toUpperCase() + ' | Mining');
|
||||
}));
|
||||
}
|
||||
|
||||
ngOnDestroy() {
|
||||
this.subs.forEach(subscription => {
|
||||
if(subscription instanceof Subscription) {
|
||||
subscription.unsubscribe();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
import {NgModule} from '@angular/core';
|
||||
import {RouterModule} from "@angular/router";
|
||||
import {CommonModule} from "@angular/common";
|
||||
import {MiningComponent} from "./mining.component";
|
||||
import {PageContentModule} from "../../openaireLibrary/dashboard/sharedComponents/page-content/page-content.module";
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
CommonModule,
|
||||
RouterModule.forChild([
|
||||
{
|
||||
path: '', component: MiningComponent, children: [
|
||||
{path: '', loadChildren: () => import('./mining-routing.module').then(m => m.MiningRoutingModule)}
|
||||
]
|
||||
}
|
||||
]),
|
||||
PageContentModule,
|
||||
],
|
||||
declarations: [MiningComponent],
|
||||
exports: [MiningComponent]
|
||||
})
|
||||
export class MiningModule {
|
||||
}
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
@use "sass:meta";
|
||||
@import "node_modules/interactiveminingv3/assets/css/variables.css";
|
||||
|
||||
.mining {
|
||||
|
||||
@include meta.load-css("node_modules/interactiveminingv3/assets/css/interactive-mining.css");
|
||||
@include meta.load-css("node_modules/interactiveminingv3/assets/css/animations.css");
|
||||
}
|
||||
Loading…
Reference in New Issue