[general] Frontend testing fixes (#84)

assets/models/channels-controls/store.ts

@@ -1,6 +1,6 @@
 import { defineStore } from 'pinia';
 import axios from 'axios';
-import JsonaService from 'jsona';
+import { Jsona } from 'jsona';
 import Ajv from 'ajv';
 import { v4 as uuid } from 'uuid';
 import get from 'lodash/get';
@@ -42,7 +42,7 @@ import { useWsExchangeClient } from '@fastybird/ws-exchange-plugin';
 
 const jsonSchemaValidator = new Ajv();
 
-const jsonApiFormatter = new JsonaService({
+const jsonApiFormatter = new Jsona({
 	modelPropertiesMapper: new JsonApiModelPropertiesMapper(),
 	jsonPropertiesMapper: new JsonApiJsonPropertiesMapper(),
 });

assets/models/channels-properties/store.ts

@@ -1,6 +1,6 @@
 import { defineStore } from 'pinia';
 import axios from 'axios';
-import JsonaService from 'jsona';
+import { Jsona } from 'jsona';
 import Ajv from 'ajv';
 import { v4 as uuid } from 'uuid';
 import get from 'lodash/get';
@@ -35,7 +35,7 @@ import {
 
 const jsonSchemaValidator = new Ajv();
 
-const jsonApiFormatter = new JsonaService({
+const jsonApiFormatter = new Jsona({
 	modelPropertiesMapper: new JsonApiModelPropertiesMapper(),
 	jsonPropertiesMapper: new JsonApiJsonPropertiesMapper(),
 });

assets/models/channels/store.ts

@@ -1,6 +1,6 @@
 import { defineStore } from 'pinia';
 import axios from 'axios';
-import JsonaService from 'jsona';
+import { Jsona } from 'jsona';
 import Ajv from 'ajv';
 import { v4 as uuid } from 'uuid';
 import get from 'lodash/get';
@@ -35,7 +35,7 @@ import {
 
 const jsonSchemaValidator = new Ajv();
 
-const jsonApiFormatter = new JsonaService({
+const jsonApiFormatter = new Jsona({
 	modelPropertiesMapper: new JsonApiModelPropertiesMapper(),
 	jsonPropertiesMapper: new JsonApiJsonPropertiesMapper(),
 });

assets/models/connectors-controls/store.ts

@@ -1,6 +1,6 @@
 import { defineStore } from 'pinia';
 import axios from 'axios';
-import JsonaService from 'jsona';
+import { Jsona } from 'jsona';
 import Ajv from 'ajv';
 import { v4 as uuid } from 'uuid';
 import get from 'lodash/get';
@@ -34,7 +34,7 @@ import {
 
 const jsonSchemaValidator = new Ajv();
 
-const jsonApiFormatter = new JsonaService({
+const jsonApiFormatter = new Jsona({
 	modelPropertiesMapper: new JsonApiModelPropertiesMapper(),
 	jsonPropertiesMapper: new JsonApiJsonPropertiesMapper(),
 });

assets/models/connectors-properties/store.ts

@@ -1,6 +1,6 @@
 import { defineStore } from 'pinia';
 import axios from 'axios';
-import JsonaService from 'jsona';
+import { Jsona } from 'jsona';
 import Ajv from 'ajv';
 import { v4 as uuid } from 'uuid';
 import get from 'lodash/get';
@@ -40,7 +40,7 @@ import {
 
 const jsonSchemaValidator = new Ajv();
 
-const jsonApiFormatter = new JsonaService({
+const jsonApiFormatter = new Jsona({
 	modelPropertiesMapper: new JsonApiModelPropertiesMapper(),
 	jsonPropertiesMapper: new JsonApiJsonPropertiesMapper(),
 });

assets/models/connectors/store.ts

@@ -1,6 +1,6 @@
 import { defineStore } from 'pinia';
 import axios from 'axios';
-import JsonaService from 'jsona';
+import { Jsona } from 'jsona';
 import Ajv from 'ajv';
 import { v4 as uuid } from 'uuid';
 import get from 'lodash/get';
@@ -39,7 +39,7 @@ import {
 
 const jsonSchemaValidator = new Ajv();
 
-const jsonApiFormatter = new JsonaService({
+const jsonApiFormatter = new Jsona({
 	modelPropertiesMapper: new JsonApiModelPropertiesMapper(),
 	jsonPropertiesMapper: new JsonApiJsonPropertiesMapper(),
 });

assets/models/devices-controls/store.ts

@@ -1,6 +1,6 @@
 import { defineStore } from 'pinia';
 import axios from 'axios';
-import JsonaService from 'jsona';
+import { Jsona } from 'jsona';
 import Ajv from 'ajv';
 import { v4 as uuid } from 'uuid';
 import get from 'lodash/get';
@@ -34,7 +34,7 @@ import {
 
 const jsonSchemaValidator = new Ajv();
 
-const jsonApiFormatter = new JsonaService({
+const jsonApiFormatter = new Jsona({
 	modelPropertiesMapper: new JsonApiModelPropertiesMapper(),
 	jsonPropertiesMapper: new JsonApiJsonPropertiesMapper(),
 });

assets/models/devices-properties/store.ts

@@ -1,6 +1,6 @@
 import { defineStore } from 'pinia';
 import axios from 'axios';
-import JsonaService from 'jsona';
+import { Jsona } from 'jsona';
 import Ajv from 'ajv';
 import { v4 as uuid } from 'uuid';
 import get from 'lodash/get';
@@ -35,7 +35,7 @@ import {
 
 const jsonSchemaValidator = new Ajv();
 
-const jsonApiFormatter = new JsonaService({
+const jsonApiFormatter = new Jsona({
 	modelPropertiesMapper: new JsonApiModelPropertiesMapper(),
 	jsonPropertiesMapper: new JsonApiJsonPropertiesMapper(),
 });

assets/models/devices/store.ts

@@ -1,6 +1,6 @@
 import { defineStore } from 'pinia';
 import axios from 'axios';
-import JsonaService from 'jsona';
+import { Jsona } from 'jsona';
 import Ajv from 'ajv';
 import { v4 as uuid } from 'uuid';
 import get from 'lodash/get';
@@ -39,7 +39,7 @@ import {
 
 const jsonSchemaValidator = new Ajv();
 
-const jsonApiFormatter = new JsonaService({
+const jsonApiFormatter = new Jsona({
 	modelPropertiesMapper: new JsonApiModelPropertiesMapper(),
 	jsonPropertiesMapper: new JsonApiJsonPropertiesMapper(),
 });

assets/views/view-connectors.vue

@@ -59,7 +59,10 @@
 			</fb-layout-header>
 		</template>
 
-		<template #content>
+		<template
+			v-if="isLoading || (!isLoading && isExtraSmallDevice && isPartialDetailRoute)"
+			#content
+		>
 			<div
 				v-if="isLoading"
 				class="fb-devices-module-view-connectors__loading"

assets/views/view-devices.vue

@@ -59,7 +59,10 @@
 			</fb-layout-header>
 		</template>
 
-		<template #content>
+		<template
+			v-if="isLoading || (!isLoading && isExtraSmallDevice && isPartialDetailRoute)"
+			#content
+		>
 			<div
 				v-if="isLoading"
 				class="fb-devices-module-view-devices__loading"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fastybird/devices-module",
-  "version": "1.0.0-dev.12",
+  "version": "1.0.0-dev.13",
   "type": "module",
   "description": "FastyBird IoT devices module for connectors & devices management & basic control logic",
   "keywords": [
@@ -49,6 +49,8 @@
     "serve": "vite preview",
     "clean": "rimraf dist && rimraf tsconfig.tsbuildinfo",
     "build": "yarn clean && vue-tsc --noEmit && vite build",
+    "build:dev": "vue-tsc --noEmit && vite build --watch --mode development",
+    "build:only": "yarn clean && vite build",
     "types": "vue-tsc --noEmit",
     "lint:js": "eslint --ext .js,.ts,.vue --ignore-path .gitignore assets",
     "lint:js:fix": "eslint --ext .js,.ts,.vue --ignore-path .gitignore assets --fix",

src/DI/DevicesExtension.php

@@ -67,14 +67,14 @@ public static function register(
 			BootstrapBoot\Configurator $config,
 			DI\Compiler $compiler,
 		) use ($extensionName): void {
-			$compiler->addExtension($extensionName, new DevicesExtension());
+			$compiler->addExtension($extensionName, new self());
 		};
 	}
 
 	public function getConfigSchema(): Schema\Schema
 	{
 		return Schema\Expect::structure([
-			'apiPrefix' => Schema\Expect::bool(false),
+			'apiPrefix' => Schema\Expect::bool(true),
 		]);
 	}
 

src/Entities/Channels/Properties/Property.php

@@ -69,7 +69,7 @@ abstract class Property extends Entities\Property
 	 * @ORM\ManyToOne(targetEntity="FastyBird\Module\Devices\Entities\Channels\Properties\Property", inversedBy="children")
 	 * @ORM\JoinColumn(name="parent_id", referencedColumnName="property_id", nullable=true, onDelete="CASCADE")
 	 */
-	protected Property|null $parent = null;
+	protected self|null $parent = null;
 
 	/**
 	 * @var Common\Collections\Collection<int, Property>
@@ -93,12 +93,12 @@ public function __construct(
 		$this->children = new Common\Collections\ArrayCollection();
 	}
 
-	public function getParent(): Property|null
+	public function getParent(): self|null
 	{
 		return $this->parent;
 	}
 
-	public function setParent(Property $device): void
+	public function setParent(self $device): void
 	{
 		$this->parent = $device;
 	}
@@ -129,7 +129,7 @@ public function setChildren(array $children): void
 		}
 	}
 
-	public function addChild(Property $child): void
+	public function addChild(self $child): void
 	{
 		// Check if collection does not contain inserting entity
 		if (!$this->children->contains($child)) {
@@ -138,7 +138,7 @@ public function addChild(Property $child): void
 		}
 	}
 
-	public function removeChild(Property $child): void
+	public function removeChild(self $child): void
 	{
 		// Check if collection contain removing entity...
 		if ($this->children->contains($child)) {

src/Entities/Devices/Device.php

@@ -224,7 +224,7 @@ public function setParents(array $parents): void
 		}
 	}
 
-	public function addParent(Device $device): void
+	public function addParent(self $device): void
 	{
 		// Check if collection does not contain inserting entity
 		if (!$this->parents->contains($device)) {
@@ -233,7 +233,7 @@ public function addParent(Device $device): void
 		}
 	}
 
-	public function removeParent(Device $parent): void
+	public function removeParent(self $parent): void
 	{
 		$this->parents->removeElement($parent);
 	}
@@ -260,7 +260,7 @@ public function setChildren(array $children): void
 		}
 	}
 
-	public function addChild(Device $child): void
+	public function addChild(self $child): void
 	{
 		// Check if collection does not contain inserting entity
 		if (!$this->children->contains($child)) {
@@ -269,7 +269,7 @@ public function addChild(Device $child): void
 		}
 	}
 
-	public function removeChild(Device $child): void
+	public function removeChild(self $child): void
 	{
 		// Check if collection contain removing entity...
 		if ($this->children->contains($child)) {

src/Entities/Devices/Properties/Property.php

@@ -69,7 +69,7 @@ abstract class Property extends Entities\Property
 	 * @ORM\ManyToOne(targetEntity="FastyBird\Module\Devices\Entities\Devices\Properties\Property", inversedBy="children")
 	 * @ORM\JoinColumn(name="parent_id", referencedColumnName="property_id", nullable=true, onDelete="CASCADE")
 	 */
-	protected Property|null $parent = null;
+	protected self|null $parent = null;
 
 	/**
 	 * @var Common\Collections\Collection<int, Property>
@@ -93,12 +93,12 @@ public function __construct(
 		$this->children = new Common\Collections\ArrayCollection();
 	}
 
-	public function getParent(): Property|null
+	public function getParent(): self|null
 	{
 		return $this->parent;
 	}
 
-	public function setParent(Property $device): void
+	public function setParent(self $device): void
 	{
 		$this->parent = $device;
 	}
@@ -130,7 +130,7 @@ public function setChildren(array $children): void
 		}
 	}
 
-	public function addChild(Property $child): void
+	public function addChild(self $child): void
 	{
 		// Check if collection does not contain inserting entity
 		if (!$this->children->contains($child)) {
@@ -139,7 +139,7 @@ public function addChild(Property $child): void
 		}
 	}
 
-	public function removeChild(Property $child): void
+	public function removeChild(self $child): void
 	{
 		// Check if collection contain removing entity...
 		if ($this->children->contains($child)) {