Commit f325da32 authored by ncastejon's avatar ncastejon
Browse files

Fix all issues coming from the merge.

parent aedfa821
{
"name": "webapp",
<<<<<<< HEAD
"version": "2.3.2",
=======
"version": "2.3.1",
>>>>>>> Change colors for the file extension.
"lockfileVersion": 1,
"requires": true,
"dependencies": {
......@@ -10891,11 +10887,7 @@
"dev": true,
"optional": true,
"requires": {
<<<<<<< HEAD
"commander": "~2.20.3",
=======
"commander": "~2.20.0",
>>>>>>> Change colors for the file extension.
"source-map": "~0.6.1"
},
"dependencies": {
......
@import "../../../../../scss/variables";
@import "../../../../../../node_modules/bulma/sass/utilities/_all";
@import "../../../../scss/variables.scss";
@import "../../../../../node_modules/bulma/sass/utilities/_all.sass";
.resource-container {
background-color: $grey-background-color;
......
import { Component, OnInit, OnDestroy } from '@angular/core';
import { DatasetDetailService, ResourcesService } from '../../../services';
import { Metadata, Resource } from '../../../models';
import { Subscription, forkJoin } from 'rxjs';
import { IMetadataLink } from '../../../models/metadata.model';
import { NotificationService } from '../../../../core/services';
import { notificationMessages } from '../../../../../i18n/traductions';
import { Notification } from '../../../../core/models';
import { Component, OnDestroy, OnInit } from '@angular/core';
import { Subscription } from 'rxjs';
import { notificationMessages } from '../../../../i18n/traductions';
import { Notification } from '../../../core/models';
import { NotificationService } from '../../../core/services';
import { IMetadataLink, Metadata } from '../../../shared/models';
import { Resource } from '../../models';
import { DatasetDetailService, ResourcesService } from '../../services';
@Component({
selector: 'app-dataset-api',
......
@import '../../../../../../scss/variables.scss';
@import "../../../../../../../node_modules/bulma/sass/utilities/_all.sass";
@import '../../../../../scss/variables.scss';
@import "../../../../../../node_modules/bulma/sass/utilities/_all.sass";
.resources {
margin: 0;
......
......@@ -12,7 +12,7 @@ import { ResourcesService } from '../../../services';
export class ResourcesQueryableComponent implements OnInit {
@Input() resources: Resource[];
@Input() metadata: Metadata;
selectedResource: Resource;
selectedApis: {};
projections: Projection[];
constructor(
......@@ -21,14 +21,15 @@ export class ResourcesQueryableComponent implements OnInit {
}
ngOnInit() {
this.selectedApis = {};
this._resourcesService.getProjections().subscribe((projections) => {
this.projections = projections;
this.selectedResource = this.resources[0];
// this.selectedResource = this.resources[0];
});
}
updateSelectedResource(resource: Resource) {
this.selectedResource = resource;
updateSelectedResource(idResource: string) {
this.selectedApis[idResource] = !this.selectedApis[idResource];
}
......
import { Component, OnInit } from '@angular/core';
import { IMetadataLink, Metadata, Resource } from '../../../models';
import { DatasetDetailService, ResourcesService } from '../../../services';
import { NotificationService } from '../../../../core/services';
import { Subscription } from 'rxjs';
import { notificationMessages } from '../../../../../i18n/traductions';
import { Notification } from '../../../../core/models';
import { notificationMessages } from '../../../../i18n/traductions';
import { Notification } from '../../../core/models';
import { NotificationService } from '../../../core/services';
import { IMetadataLink, Metadata } from '../../../shared/models';
import { Resource } from '../../models';
import { DatasetDetailService, ResourcesService } from '../../services';
@Component({
selector: 'app-dataset-downloads',
......
import { Component, Input, OnInit } from '@angular/core';
import { notificationMessages } from '../../../../../../i18n/traductions';
import { NotificationService } from '../../../../../core/services';
import { Resource } from '../../../../models';
import { linkFormats } from '../../../../models/metadata.model';
import { Format } from '../../../../models/resource.model';
import { notificationMessages } from '../../../../../i18n/traductions';
import { NotificationService } from '../../../../core/services';
import { linkFormats } from '../../../../shared/models';
import { Format, Resource } from '../../../models';
@Component({
selector: 'app-resource-custom-download',
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment