From 45444d9373cdea7b7db60f3d67094ad52c16bedf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thea=20Sch=C3=B6bl?= Date: Wed, 31 May 2023 15:30:25 +0200 Subject: [PATCH] fix: pipeline --- .gitignore | 3 +++ .../backend/config/b-tu/elasticsearchrc.js | 2 +- .../backend/config/default/elasticsearchrc.js | 2 +- backend/backend/src/environment.d.ts | 3 +++ .../src/storage/elasticsearch/aggregations.ts | 2 +- .../query/boost/boost-functions.ts | 2 +- .../query/boost/scoring-functions.ts | 2 +- .../src/storage/elasticsearch/query/filter.ts | 23 ++++++++++------ .../elasticsearch/query/filters/boolean.ts | 2 +- .../elasticsearch/query/filters/date-range.ts | 2 +- .../elasticsearch/query/filters/distance.ts | 2 +- .../query/filters/numeric-range.ts | 3 +-- .../elasticsearch/query/sort/distance.ts | 2 +- .../storage/elasticsearch/query/sort/ducet.ts | 2 +- .../storage/elasticsearch/query/sort/price.ts | 2 +- .../src/storage/elasticsearch/types/guards.ts | 0 .../src/storage/elasticsearch/types/util.ts | 3 +-- .../test/storage/elasticsearch/query.spec.ts | 8 +++--- examples/minimal-connector/src/cli.ts | 17 +++++++----- examples/minimal-connector/src/common.ts | 10 +++---- examples/minimal-connector/src/connector.ts | 5 ++-- .../src/minimal-connector.ts | 4 +-- examples/minimal-plugin/src/app.ts | 1 - .../src/plugin/minimal-plugin.ts | 18 +++++-------- .../src/app/modules/about/about-licenses.scss | 18 ------------- .../news-section/news-section.component.scss | 26 ------------------- .../src/app/modules/data/list/data-list.scss | 4 --- .../modules/settings/item/settings-item.scss | 10 ------- package.json | 8 +++--- packages/es-mapping-generator/.eslintrc | 8 +++++- .../src/types/mapping.d.ts | 0 31 files changed, 74 insertions(+), 120 deletions(-) delete mode 100644 backend/backend/src/storage/elasticsearch/types/guards.ts delete mode 100644 packages/es-mapping-generator/src/types/mapping.d.ts diff --git a/.gitignore b/.gitignore index 7c2254fd..24e9ac0c 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,9 @@ pids *.pid.lock .DS_Store +.angular/ +www/ + # Directory for instrumented libs generated by jscoverage/JSCover lib-cov diff --git a/backend/backend/config/b-tu/elasticsearchrc.js b/backend/backend/config/b-tu/elasticsearchrc.js index 2bcd7dc1..062bc7f4 100644 --- a/backend/backend/config/b-tu/elasticsearchrc.js +++ b/backend/backend/config/b-tu/elasticsearchrc.js @@ -3,7 +3,7 @@ /** * This is the database configuration for the technical university of berlin * - * @type {import('@openstapps/logger').RecursivePartial} + * @type {import('@openstapps/logger').RecursivePartial} */ const config = { internal: { diff --git a/backend/backend/config/default/elasticsearchrc.js b/backend/backend/config/default/elasticsearchrc.js index 0b6feade..2c535d9a 100644 --- a/backend/backend/config/default/elasticsearchrc.js +++ b/backend/backend/config/default/elasticsearchrc.js @@ -11,7 +11,7 @@ * * To get more information about the meaning of specific fields, please use your IDE to read the TSDoc documentation. * - * @type {import('../../src/storage/elasticsearch/types/elasticsearch.js')} + * @type {import('../../src/storage/elasticsearch/types/elasticsearch-config.js')} */ const config = { internal: { diff --git a/backend/backend/src/environment.d.ts b/backend/backend/src/environment.d.ts index bbc1ea2b..094d567e 100644 --- a/backend/backend/src/environment.d.ts +++ b/backend/backend/src/environment.d.ts @@ -1,5 +1,6 @@ declare global { namespace NodeJS { + // eslint-disable-next-line unicorn/prevent-abbreviations interface ProcessEnv { NODE_APP_INSTANCE: 'default' | 'b-tu' | 'f-u' | 'fb-fh' | 'ks-ug' | string | undefined; NODE_CONFIG_ENV: 'elasticsearch' | string | undefined; @@ -12,3 +13,5 @@ declare global { } } } + +export {}; diff --git a/backend/backend/src/storage/elasticsearch/aggregations.ts b/backend/backend/src/storage/elasticsearch/aggregations.ts index 0df62027..f60cc352 100644 --- a/backend/backend/src/storage/elasticsearch/aggregations.ts +++ b/backend/backend/src/storage/elasticsearch/aggregations.ts @@ -18,7 +18,7 @@ import { AggregationsAggregate, AggregationsFiltersAggregate, AggregationsMultiTermsBucket, -} from '@elastic/elasticsearch/lib/api/types'; +} from '@elastic/elasticsearch/lib/api/types.js'; import {SCFacet, SCThingType} from '@openstapps/core'; /** diff --git a/backend/backend/src/storage/elasticsearch/query/boost/boost-functions.ts b/backend/backend/src/storage/elasticsearch/query/boost/boost-functions.ts index a47e698e..0648c6b7 100644 --- a/backend/backend/src/storage/elasticsearch/query/boost/boost-functions.ts +++ b/backend/backend/src/storage/elasticsearch/query/boost/boost-functions.ts @@ -12,7 +12,7 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -import {QueryDslFunctionScoreContainer} from '@elastic/elasticsearch/lib/api/types'; +import {QueryDslFunctionScoreContainer} from '@elastic/elasticsearch/lib/api/types.js'; import {SCBackendConfigurationSearchBoostingType} from '@openstapps/core'; import {QueryDslSpecificQueryContainer} from '../../types/util.js'; diff --git a/backend/backend/src/storage/elasticsearch/query/boost/scoring-functions.ts b/backend/backend/src/storage/elasticsearch/query/boost/scoring-functions.ts index 3dcf7e07..8228880e 100644 --- a/backend/backend/src/storage/elasticsearch/query/boost/scoring-functions.ts +++ b/backend/backend/src/storage/elasticsearch/query/boost/scoring-functions.ts @@ -12,7 +12,7 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -import {QueryDslFunctionScoreContainer} from '@elastic/elasticsearch/lib/api/types'; +import {QueryDslFunctionScoreContainer} from '@elastic/elasticsearch/lib/api/types.js'; import {SCBackendConfigurationSearchBoostingContext, SCSearchContext} from '@openstapps/core'; import {buildFunctionsForBoostingTypes} from './boost-functions.js'; diff --git a/backend/backend/src/storage/elasticsearch/query/filter.ts b/backend/backend/src/storage/elasticsearch/query/filter.ts index a276cad6..430d1cab 100644 --- a/backend/backend/src/storage/elasticsearch/query/filter.ts +++ b/backend/backend/src/storage/elasticsearch/query/filter.ts @@ -12,7 +12,7 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -import {QueryDslQueryContainer} from '@elastic/elasticsearch/lib/api/types'; +import {QueryDslQueryContainer} from '@elastic/elasticsearch/lib/api/types.js'; import {SCSearchFilter} from '@openstapps/core'; import {buildBooleanFilter} from './filters/boolean.js'; import {buildAvailabilityFilter} from './filters/availability.js'; @@ -29,19 +29,26 @@ import {buildValueFilter} from './filters/value.js'; */ export function buildFilter(filter: SCSearchFilter): QueryDslQueryContainer { switch (filter.type) { - case 'value': + case 'value': { return buildValueFilter(filter); - case 'availability': + } + case 'availability': { return buildAvailabilityFilter(filter); - case 'distance': + } + case 'distance': { return buildDistanceFilter(filter); - case 'boolean': + } + case 'boolean': { return buildBooleanFilter(filter); - case 'numeric range': + } + case 'numeric range': { return buildNumericRangeFilter(filter); - case 'date range': + } + case 'date range': { return buildDateRangeFilter(filter); - case 'geo': + } + case 'geo': { return buildGeoFilter(filter); + } } } diff --git a/backend/backend/src/storage/elasticsearch/query/filters/boolean.ts b/backend/backend/src/storage/elasticsearch/query/filters/boolean.ts index 0044bdd3..ce8cc4bb 100644 --- a/backend/backend/src/storage/elasticsearch/query/filters/boolean.ts +++ b/backend/backend/src/storage/elasticsearch/query/filters/boolean.ts @@ -12,7 +12,7 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -import {QueryDslBoolQuery} from '@elastic/elasticsearch/lib/api/types'; +import {QueryDslBoolQuery} from '@elastic/elasticsearch/lib/api/types.js'; import {SCSearchBooleanFilter} from '@openstapps/core'; import {QueryDslSpecificQueryContainer} from '../../types/util.js'; import {buildFilter} from '../filter.js'; diff --git a/backend/backend/src/storage/elasticsearch/query/filters/date-range.ts b/backend/backend/src/storage/elasticsearch/query/filters/date-range.ts index 3bf61629..45f9201e 100644 --- a/backend/backend/src/storage/elasticsearch/query/filters/date-range.ts +++ b/backend/backend/src/storage/elasticsearch/query/filters/date-range.ts @@ -12,7 +12,7 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -import {QueryDslDateRangeQuery} from '@elastic/elasticsearch/lib/api/types'; +import {QueryDslDateRangeQuery} from '@elastic/elasticsearch/lib/api/types.js'; import {SCSearchDateRangeFilter} from '@openstapps/core'; import {QueryDslSpecificQueryContainer} from '../../types/util.js'; diff --git a/backend/backend/src/storage/elasticsearch/query/filters/distance.ts b/backend/backend/src/storage/elasticsearch/query/filters/distance.ts index e833b801..2ec9aa36 100644 --- a/backend/backend/src/storage/elasticsearch/query/filters/distance.ts +++ b/backend/backend/src/storage/elasticsearch/query/filters/distance.ts @@ -12,7 +12,7 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -import {QueryDslGeoDistanceQuery} from '@elastic/elasticsearch/lib/api/types'; +import {QueryDslGeoDistanceQuery} from '@elastic/elasticsearch/lib/api/types.js'; import {SCSearchDistanceFilter} from '@openstapps/core'; import {QueryDslSpecificQueryContainer} from '../../types/util.js'; diff --git a/backend/backend/src/storage/elasticsearch/query/filters/numeric-range.ts b/backend/backend/src/storage/elasticsearch/query/filters/numeric-range.ts index 2b94ef03..b6c01c4b 100644 --- a/backend/backend/src/storage/elasticsearch/query/filters/numeric-range.ts +++ b/backend/backend/src/storage/elasticsearch/query/filters/numeric-range.ts @@ -12,8 +12,7 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ - -import {QueryDslNumberRangeQuery} from '@elastic/elasticsearch/lib/api/types'; +import {QueryDslNumberRangeQuery} from '@elastic/elasticsearch/lib/api/types.js'; import {SCSearchNumericRangeFilter} from '@openstapps/core'; import {QueryDslSpecificQueryContainer} from '../../types/util.js'; diff --git a/backend/backend/src/storage/elasticsearch/query/sort/distance.ts b/backend/backend/src/storage/elasticsearch/query/sort/distance.ts index 3319f859..9e9c41f7 100644 --- a/backend/backend/src/storage/elasticsearch/query/sort/distance.ts +++ b/backend/backend/src/storage/elasticsearch/query/sort/distance.ts @@ -12,7 +12,7 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -import {SortOptions} from '@elastic/elasticsearch/lib/api/types'; +import {SortOptions} from '@elastic/elasticsearch/lib/api/types.js'; import {SCDistanceSort} from '@openstapps/core'; /** diff --git a/backend/backend/src/storage/elasticsearch/query/sort/ducet.ts b/backend/backend/src/storage/elasticsearch/query/sort/ducet.ts index b0936d88..2adb73bc 100644 --- a/backend/backend/src/storage/elasticsearch/query/sort/ducet.ts +++ b/backend/backend/src/storage/elasticsearch/query/sort/ducet.ts @@ -12,7 +12,7 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -import {SortOptions} from '@elastic/elasticsearch/lib/api/types'; +import {SortOptions} from '@elastic/elasticsearch/lib/api/types.js'; import {SCDucetSort} from '@openstapps/core'; /** diff --git a/backend/backend/src/storage/elasticsearch/query/sort/price.ts b/backend/backend/src/storage/elasticsearch/query/sort/price.ts index 6bd319e4..75f9436a 100644 --- a/backend/backend/src/storage/elasticsearch/query/sort/price.ts +++ b/backend/backend/src/storage/elasticsearch/query/sort/price.ts @@ -12,7 +12,7 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -import {SortOptions} from '@elastic/elasticsearch/lib/api/types'; +import {SortOptions} from '@elastic/elasticsearch/lib/api/types.js'; import {SCPriceSort, SCSportCoursePriceGroup, SCThingsField} from '@openstapps/core'; /** diff --git a/backend/backend/src/storage/elasticsearch/types/guards.ts b/backend/backend/src/storage/elasticsearch/types/guards.ts deleted file mode 100644 index e69de29b..00000000 diff --git a/backend/backend/src/storage/elasticsearch/types/util.ts b/backend/backend/src/storage/elasticsearch/types/util.ts index 15bf449b..432b9bc7 100644 --- a/backend/backend/src/storage/elasticsearch/types/util.ts +++ b/backend/backend/src/storage/elasticsearch/types/util.ts @@ -12,8 +12,7 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ - -import {QueryDslQueryContainer} from '@elastic/elasticsearch/lib/api/types'; +import {QueryDslQueryContainer} from '@elastic/elasticsearch/lib/api/types.js'; export type QueryDslSpecificQueryContainer = Required< Pick diff --git a/backend/backend/test/storage/elasticsearch/query.spec.ts b/backend/backend/test/storage/elasticsearch/query.spec.ts index 3483b638..af7087cb 100644 --- a/backend/backend/test/storage/elasticsearch/query.spec.ts +++ b/backend/backend/test/storage/elasticsearch/query.spec.ts @@ -31,7 +31,7 @@ import {buildQuery} from '../../../src/storage/elasticsearch/query/query.js'; import {buildSort} from '../../../src/storage/elasticsearch/query/sort.js'; import {ElasticsearchConfig} from '../../../src/storage/elasticsearch/types/elasticsearch-config.js'; import {QueryDslSpecificQueryContainer} from '../../../src/storage/elasticsearch/types/util.js'; -import {SortCombinations} from '@elastic/elasticsearch/lib/api/types.js'; +import {QueryDslRangeQuery, SortCombinations} from '@elastic/elasticsearch/lib/api/types.js'; import {backendConfig} from '../../../src/config.js'; describe('Query', function () { @@ -363,8 +363,10 @@ describe('Query', function () { const filter = buildFilter(rawFilter) as QueryDslSpecificQueryContainer<'range'>; expect(filter).to.deep.equal(expectedFilter); for (const bound of ['g', 'l']) { - const inclusiveExists = typeof filter.range.price[`${bound}t`] !== 'undefined'; - const exclusiveExists = typeof filter.range.price[`${bound}te`] !== 'undefined'; + const inclusiveExists = + typeof filter.range.price?.[`${bound}t` as keyof QueryDslRangeQuery] !== 'undefined'; + const exclusiveExists = + typeof filter.range.price?.[`${bound}te` as keyof QueryDslRangeQuery] !== 'undefined'; // only one should exist at the same time expect(inclusiveExists && exclusiveExists).to.be.false; diff --git a/examples/minimal-connector/src/cli.ts b/examples/minimal-connector/src/cli.ts index 572e8ffe..b5f4c0a2 100644 --- a/examples/minimal-connector/src/cli.ts +++ b/examples/minimal-connector/src/cli.ts @@ -15,24 +15,29 @@ import {Logger} from '@openstapps/logger'; import {Command} from 'commander'; import {readFileSync} from 'fs'; -import {join} from 'path'; +import path from 'path'; import {executeConnector, isValidSCNamespace} from './common.js'; import {MinimalConnector} from './minimal-connector.js'; +import * as url from 'url'; process.on('unhandledRejection', error => { throw error; }); -const connectorVersion = JSON.parse(readFileSync(join(__dirname, '..', 'package.json')).toString()).version; +const dirname = path.dirname(url.fileURLToPath(import.meta.url)); +const connectorVersion = JSON.parse( + readFileSync(path.join(dirname, '..', 'package.json')).toString(), +).version; const commander = new Command(); /** - * Uses arguments to paramtrize the connector execution + * Uses arguments to parameterize the connector execution * * backendURL - URL of the StApps backend deployment e.g. http://localhost:3000 - * origin - Origin, where the data comes from. Typically the name of the connector e.g. minimal-connector - * licensePlate - The license plate of your school. Must be matched to a SCNamespace e.g. f-u + * origin - Origin, where the data comes from. + * Typically, the name of the connector e.g., minimal-connector licensePlate - The license plate of your school. + * Must be matched to a SCNamespace e.g., f-u */ commander .command('run ') @@ -41,7 +46,7 @@ commander if (backendURL.length === 0) { throw new Error('Param "backend" needs to have a length greater zero.'); } - const originRegex = /^[a-z\-\_0-9]+$/; + const originRegex = /^[a-z\-_0-9]+$/; if (!originRegex.test(origin)) { throw new Error( 'Origin name can only consist of lowercase letters from a-z, "-", "_" and integer numbers.', diff --git a/examples/minimal-connector/src/common.ts b/examples/minimal-connector/src/common.ts index 56906819..5e5010db 100644 --- a/examples/minimal-connector/src/common.ts +++ b/examples/minimal-connector/src/common.ts @@ -12,8 +12,7 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -import {ConnectorClient} from '@openstapps/api/lib/connector-client.js'; -import {HttpClient} from '@openstapps/api/lib/http-client.js'; +import {ConnectorClient, HttpClient} from '@openstapps/api'; import {SCLicensePlate, SCNamespaces, SCThings} from '@openstapps/core'; import {Connector} from './connector.js'; @@ -48,9 +47,6 @@ export function createUUID(itemIdentifier: unknown, licensePlate: SCLicensePlate export async function executeConnector(backend: string, connector: Connector) { const items: T[] = await connector.getItems(); const client: ConnectorClient = new ConnectorClient(new HttpClient(), backend); - try { - await client.index(items, connector.origin); - } catch (err) { - throw err; - } + // this might throw an error! + await client.index(items, connector.origin); } diff --git a/examples/minimal-connector/src/connector.ts b/examples/minimal-connector/src/connector.ts index 9c57d4d8..8e7d399a 100644 --- a/examples/minimal-connector/src/connector.ts +++ b/examples/minimal-connector/src/connector.ts @@ -18,16 +18,17 @@ import {createUUID} from './common.js'; /** * Provides abstracted methods for the connector execution process * - * By extending this class connector-developers only need to implement load and transform of the data + * By extending this class connector-developers only need to implement the load and transform of the data * Pushing the data to the backend will be handled automatically * - * @typeparam T Any serializable type + * @template T Any serializable type */ export abstract class Connector { /** * License plate of the school */ protected licensePlate: SCLicensePlate; + /** * Name of the connector */ diff --git a/examples/minimal-connector/src/minimal-connector.ts b/examples/minimal-connector/src/minimal-connector.ts index b92814e2..eaa52f6d 100644 --- a/examples/minimal-connector/src/minimal-connector.ts +++ b/examples/minimal-connector/src/minimal-connector.ts @@ -50,7 +50,7 @@ export class MinimalConnector extends Connector { * Mock-up data */ protected async fetchItems(): Promise { - const importedItems: SCMessage[] = [ + return [ { audiences: ['students', 'employees'], categories: [], @@ -82,7 +82,5 @@ export class MinimalConnector extends Connector { uid: createUUID({id: 'message_3'}, this.licensePlate), }, ]; - - return importedItems; } } diff --git a/examples/minimal-plugin/src/app.ts b/examples/minimal-plugin/src/app.ts index 53c49f70..808442ab 100644 --- a/examples/minimal-plugin/src/app.ts +++ b/examples/minimal-plugin/src/app.ts @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ - import {HttpClient, PluginClient} from '@openstapps/api'; import {Converter} from '@openstapps/core-tools'; import {Logger} from '@openstapps/logger'; diff --git a/examples/minimal-plugin/src/plugin/minimal-plugin.ts b/examples/minimal-plugin/src/plugin/minimal-plugin.ts index 3375da02..a25dd1d9 100644 --- a/examples/minimal-plugin/src/plugin/minimal-plugin.ts +++ b/examples/minimal-plugin/src/plugin/minimal-plugin.ts @@ -32,13 +32,7 @@ export class MinimalPlugin extends Plugin { * @param numbers the list of numbers */ private static sum(numbers: number[]): number { - let out = 0; - - for (const num of numbers) { - out += num; - } - - return out; + return numbers.reduce((a, b) => a + b); } /** @@ -47,13 +41,13 @@ export class MinimalPlugin extends Plugin { * For this example the whole purpose of the plugin is to receive a list of numbers and return the sum of them. * TODO: remove the body of the function and replace with your own logic * - * @param req the express request object - * @param res the express response object + * @param request the express request object + * @param response the express response object */ // tslint:disable-next-line:prefer-function-over-method - protected async onRouteInvoke(req: express.Request, res: express.Response): Promise { + protected async onRouteInvoke(request: express.Request, response: express.Response): Promise { // get the body from the request as a SCMinimalRequest for static type-safety - const requestBody = req.body as SCMinimalRequest; + const requestBody = request.body as SCMinimalRequest; // create out response body const responseBody: SCMinimalResponse = { @@ -61,6 +55,6 @@ export class MinimalPlugin extends Plugin { }; // send the response - res.json(responseBody); + response.json(responseBody); } } diff --git a/frontend/app/src/app/modules/about/about-licenses.scss b/frontend/app/src/app/modules/about/about-licenses.scss index c0eabcec..ed32cecd 100644 --- a/frontend/app/src/app/modules/about/about-licenses.scss +++ b/frontend/app/src/app/modules/about/about-licenses.scss @@ -1,10 +1,5 @@ -<<<<<<<< HEAD:packages/es-mapping-generator/test/mapping-model/aggregations/src/types.ts -/* - * Copyright (C) 2020 StApps -======== /*! * Copyright (C) 2023 StApps ->>>>>>>> app/develop:frontend/app/src/app/modules/about/about-licenses.scss * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free * Software Foundation, version 3. @@ -17,18 +12,6 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ - -<<<<<<<< HEAD:packages/es-mapping-generator/test/mapping-model/aggregations/src/types.ts -export enum ThingType { - AggArray = 'agg array', - AggGlobal = 'agg global', - AggGlobalNested = 'agg global nested', - AggNested = 'agg nested', - AggInherited = 'agg inherited', - AggInheritedGlobal = 'agg inherited global', - AggInheritedOverwritten = 'agg inherited overwritten', -} -======== ion-content > div { height: 100%; } @@ -52,4 +35,3 @@ cdk-virtual-scroll-viewport { vertical-align: text-top; height: 14px; } ->>>>>>>> app/develop:frontend/app/src/app/modules/about/about-licenses.scss diff --git a/frontend/app/src/app/modules/dashboard/sections/news-section/news-section.component.scss b/frontend/app/src/app/modules/dashboard/sections/news-section/news-section.component.scss index 64093ebd..48409a33 100644 --- a/frontend/app/src/app/modules/dashboard/sections/news-section/news-section.component.scss +++ b/frontend/app/src/app/modules/dashboard/sections/news-section/news-section.component.scss @@ -12,35 +12,9 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ - -<<<<<<<< HEAD:frontend/app/src/app/modules/data/list/data-list-item.scss -:host { - display: block; -} - -ion-item::part(native) { - height: 100%; -} - -.ion-text-wrap ::ng-deep ion-label { - white-space: normal !important; - display: -webkit-box; - -webkit-box-orient: vertical; - -webkit-line-clamp: 3; -} - -ion-item { - --border-color: transparent; - @include border-radius-in-parallax(var(--border-radius-default)); - overflow: hidden; - --inner-padding-end: 0; - --padding-start: var(--spacing-sm); - margin: var(--spacing-sm); -======== simple-swiper { --swiper-slide-width: 256px; } ->>>>>>>> app/develop:frontend/app/src/app/modules/dashboard/sections/news-section/news-section.component.scss .more-news { font-size: var(--font-size-xl); diff --git a/frontend/app/src/app/modules/data/list/data-list.scss b/frontend/app/src/app/modules/data/list/data-list.scss index 1cdcfa27..5a4c1d23 100644 --- a/frontend/app/src/app/modules/data/list/data-list.scss +++ b/frontend/app/src/app/modules/data/list/data-list.scss @@ -12,9 +12,6 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -<<<<<<<< HEAD:frontend/app/src/app/modules/settings/item/settings-item.scss -======== - ion-list { background: none; } @@ -22,4 +19,3 @@ ion-list { skeleton-list { height: 100%; } ->>>>>>>> app/develop:frontend/app/src/app/modules/data/list/data-list.scss diff --git a/frontend/app/src/app/modules/settings/item/settings-item.scss b/frontend/app/src/app/modules/settings/item/settings-item.scss index 9ac2e6c8..bc381711 100644 --- a/frontend/app/src/app/modules/settings/item/settings-item.scss +++ b/frontend/app/src/app/modules/settings/item/settings-item.scss @@ -1,10 +1,5 @@ -<<<<<<<< HEAD:examples/minimal-plugin/src/common.ts -/* - * Copyright (C) 2019 StApps -======== /*! * Copyright (C) 2023 StApps ->>>>>>>> app/develop:frontend/app/src/app/modules/settings/item/settings-item.scss * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free * Software Foundation, version 3. @@ -17,8 +12,3 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -<<<<<<<< HEAD:examples/minimal-plugin/src/common.ts - -// TODO: place commonly used values here -======== ->>>>>>>> app/develop:frontend/app/src/app/modules/settings/item/settings-item.scss diff --git a/package.json b/package.json index 6feaeedd..16c15c4b 100644 --- a/package.json +++ b/package.json @@ -2,17 +2,17 @@ "name": "@openstapps/openstapps", "version": "2.1.0", "scripts": { - "build": "dotenv -c -- turbo run build", + "build": "dotenv -c -- turbo run build --filter=!@openstapps/app", "dev": "dotenv -c -- turbo run dev", "docs": "typedoc", "format": "dotenv -c -- turbo run format", "format:fix": "dotenv -c -- turbo run format:fix", - "lint": "dotenv -c -- turbo run lint", - "lint:fix": "dotenv -c -- turbo run lint:fix", + "lint": "dotenv -c -- turbo run lint --filter=!@openstapps/app", + "lint:fix": "dotenv -c -- turbo run lint:fix --filter=!@openstapps/app", "publish-packages": "dotenv -c -- turbo run build format lint test && changeset version && changeset publish", "syncpack": "syncpack list-mismatches && syncpack lint-semver-ranges", "syncpack:fix": "syncpack format && syncpack fix-mismatches", - "test": "dotenv -c -- turbo run test && node coverage.mjs" + "test": "dotenv -c -- turbo run test --filter=!@openstapps/app && node coverage.mjs" }, "devDependencies": { "@changesets/cli": "2.26.1", diff --git a/packages/es-mapping-generator/.eslintrc b/packages/es-mapping-generator/.eslintrc index 31d47702..9a72a793 100644 --- a/packages/es-mapping-generator/.eslintrc +++ b/packages/es-mapping-generator/.eslintrc @@ -1,3 +1,9 @@ { - "extends": "@openstapps" + "extends": "@openstapps", + "rules": { + "no-console": "off", + "unicorn/no-negated-condition": "off", + "unicorn/no-null": "off", + "jsdoc/check-tag-names": "off" + } } diff --git a/packages/es-mapping-generator/src/types/mapping.d.ts b/packages/es-mapping-generator/src/types/mapping.d.ts deleted file mode 100644 index e69de29b..00000000