Skip to content

Commit

Permalink
Using meta lib
Browse files Browse the repository at this point in the history
  • Loading branch information
akadlec committed Jan 10, 2022
1 parent 572d235 commit 69fd17e
Show file tree
Hide file tree
Showing 22 changed files with 46 additions and 46 deletions.
2 changes: 1 addition & 1 deletion public/entry.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ModuleOrigin } from '@fastybird/modules-metadata'
import { ModuleOrigin } from '@fastybird/metadata'
import { Plugin } from '@vuex-orm/core/dist/src/plugins/use'

import Device from '@/lib/models/devices/Device'
Expand Down
2 changes: 1 addition & 1 deletion public/lib/helpers.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { DataType } from '@fastybird/modules-metadata'
import { DataType } from '@fastybird/metadata'

export const cleanInvalid = (
dataType: string | null,
Expand Down
8 changes: 4 additions & 4 deletions public/lib/models/channel-configuration/index.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { Item } from '@vuex-orm/core'
import { RpCallResponse } from '@fastybird/vue-wamp-v1'
import * as exchangeEntitySchema
from '@fastybird/modules-metadata/resources/schemas/devices-module/entity.channel.configuration.json'
from '@fastybird/metadata/resources/schemas/modules/devices-module/entity.channel.configuration.json'
import {
ModuleOrigin,
ChannelConfigurationEntity as ExchangeEntity,
DevicesModuleRoutes as RoutingKeys,
GlobalRoutes as GlobalRoutingKeys,
ActionRoutes,
DataType,
} from '@fastybird/modules-metadata'
} from '@fastybird/metadata'

import {
ActionTree,
Expand Down Expand Up @@ -276,7 +276,7 @@ const moduleActions: ActionTree<ChannelConfigurationState, unknown> = {

return new Promise((resolve, reject) => {
ChannelConfiguration.wamp().call<{ data: string }>({
routing_key: GlobalRoutingKeys.CHANNELS_CONFIGURATION_DATA,
routing_key: ActionRoutes.CHANNEL_CONFIGURATION,
origin: ChannelConfiguration.$devicesModuleOrigin,
data: {
device: device.id,
Expand Down
2 changes: 1 addition & 1 deletion public/lib/models/channel-configuration/types.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { DataType } from '@fastybird/modules-metadata'
import { DataType } from '@fastybird/metadata'

import {
TJsonApiBody,
Expand Down
8 changes: 4 additions & 4 deletions public/lib/models/channel-controls/index.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { RpCallResponse } from '@fastybird/vue-wamp-v1'
import * as exchangeEntitySchema
from '@fastybird/modules-metadata/resources/schemas/devices-module/entity.channel.control.json'
from '@fastybird/metadata/resources/schemas/modules/devices-module/entity.channel.control.json'
import {
ModuleOrigin,
ChannelControlEntity as ExchangeEntity,
DevicesModuleRoutes as RoutingKeys,
GlobalRoutes as GlobalRoutingKeys,
ActionRoutes,
DataType,
ControlAction,
} from '@fastybird/modules-metadata'
} from '@fastybird/metadata'

import {
ActionTree,
Expand Down Expand Up @@ -169,7 +169,7 @@ const moduleActions: ActionTree<ChannelControlState, unknown> = {

return new Promise((resolve, reject) => {
ChannelControl.wamp().call<{ data: string }>({
routing_key: GlobalRoutingKeys.CHANNELS_CONTROL_DATA,
routing_key: ActionRoutes.CHANNEL,
origin: ChannelControl.$devicesModuleOrigin,
data: {
action: ControlAction.SET,
Expand Down
8 changes: 4 additions & 4 deletions public/lib/models/channel-properties/index.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
import { Item } from '@vuex-orm/core'
import { RpCallResponse } from '@fastybird/vue-wamp-v1'
import * as exchangeEntitySchema
from '@fastybird/modules-metadata/resources/schemas/devices-module/entity.channel.property.json'
from '@fastybird/metadata/resources/schemas/modules/devices-module/entity.channel.property.json'
import {
ModuleOrigin,
ChannelPropertyEntity as ExchangeEntity,
DevicesModuleRoutes as RoutingKeys,
GlobalRoutes as GlobalRoutingKeys,
ActionRoutes,
DataType,
normalizeValue,
PropertyType,
PropertyAction,
} from '@fastybird/modules-metadata'
} from '@fastybird/metadata'

import {
ActionTree,
Expand Down Expand Up @@ -486,7 +486,7 @@ const moduleActions: ActionTree<ChannelPropertyState, unknown> = {

return new Promise((resolve, reject) => {
ChannelProperty.wamp().call<{ data: string }>({
routing_key: GlobalRoutingKeys.CHANNELS_PROPERTIES_DATA,
routing_key: ActionRoutes.CHANNEL_PROPERTY,
origin: ChannelProperty.$devicesModuleOrigin,
data: {
action: PropertyAction.SET,
Expand Down
2 changes: 1 addition & 1 deletion public/lib/models/channel-properties/types.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { DataType } from '@fastybird/modules-metadata'
import { DataType } from '@fastybird/metadata'

import {
TJsonApiBody,
Expand Down
4 changes: 2 additions & 2 deletions public/lib/models/channels/index.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { Item } from '@vuex-orm/core'
import * as exchangeEntitySchema from '@fastybird/modules-metadata/resources/schemas/devices-module/entity.channel.json'
import * as exchangeEntitySchema from '@fastybird/metadata/resources/schemas/modules/devices-module/entity.channel.json'
import {
ModuleOrigin,
ChannelEntity as ExchangeEntity,
DevicesModuleRoutes as RoutingKeys,
} from '@fastybird/modules-metadata'
} from '@fastybird/metadata'

import {
ActionTree,
Expand Down
2 changes: 1 addition & 1 deletion public/lib/models/configuration/Configuration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {
Model,
Fields,
} from '@vuex-orm/core'
import { DataType, normalizeValue } from '@fastybird/modules-metadata'
import { DataType, normalizeValue } from '@fastybird/metadata'

import {
ConfigurationIntegerDatatypeTypes,
Expand Down
2 changes: 1 addition & 1 deletion public/lib/models/configuration/types.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { DataType } from '@fastybird/modules-metadata'
import { DataType } from '@fastybird/metadata'

// ENTITY TYPES
// ============
Expand Down
8 changes: 4 additions & 4 deletions public/lib/models/connector-controls/index.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { RpCallResponse } from '@fastybird/vue-wamp-v1'
import * as exchangeEntitySchema
from '@fastybird/modules-metadata/resources/schemas/devices-module/entity.connector.control.json'
from '@fastybird/metadata/resources/schemas/modules/devices-module/entity.connector.control.json'
import {
ModuleOrigin,
ConnectorControlEntity as ExchangeEntity,
DevicesModuleRoutes as RoutingKeys,
GlobalRoutes as GlobalRoutingKeys,
ActionRoutes,
DataType,
ControlAction,
} from '@fastybird/modules-metadata'
} from '@fastybird/metadata'

import {
ActionTree,
Expand Down Expand Up @@ -162,7 +162,7 @@ const moduleActions: ActionTree<ConnectorControlState, unknown> = {

return new Promise((resolve, reject) => {
ConnectorControl.wamp().call<{ data: string }>({
routing_key: GlobalRoutingKeys.CONNECTORS_CONTROL_DATA,
routing_key: ActionRoutes.CONNECTOR,
origin: ConnectorControl.$devicesModuleOrigin,
data: {
action: ControlAction.SET,
Expand Down
4 changes: 2 additions & 2 deletions public/lib/models/connectors/index.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { Item } from '@vuex-orm/core'
import * as exchangeEntitySchema
from '@fastybird/modules-metadata/resources/schemas/devices-module/entity.connector.json'
from '@fastybird/metadata/resources/schemas/modules/devices-module/entity.connector.json'
import {
ModuleOrigin,
ConnectorEntity as ExchangeEntity,
DevicesModuleRoutes as RoutingKeys,
ConnectorType,
} from '@fastybird/modules-metadata'
} from '@fastybird/metadata'

import {
ActionTree,
Expand Down
8 changes: 4 additions & 4 deletions public/lib/models/device-configuration/index.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { Item } from '@vuex-orm/core'
import { RpCallResponse } from '@fastybird/vue-wamp-v1'
import * as exchangeEntitySchema
from '@fastybird/modules-metadata/resources/schemas/devices-module/entity.device.configuration.json'
from '@fastybird/metadata/resources/schemas/modules/devices-module/entity.device.configuration.json'
import {
ModuleOrigin,
DeviceConfigurationEntity as ExchangeEntity,
DevicesModuleRoutes as RoutingKeys,
GlobalRoutes as GlobalRoutingKeys,
ActionRoutes,
DataType,
} from '@fastybird/modules-metadata'
} from '@fastybird/metadata'

import {
ActionTree,
Expand Down Expand Up @@ -269,7 +269,7 @@ const moduleActions: ActionTree<DeviceConfigurationState, unknown> = {

return new Promise((resolve, reject) => {
DeviceConfiguration.wamp().call<{ data: string }>({
routing_key: GlobalRoutingKeys.DEVICES_CONFIGURATION_DATA,
routing_key: ActionRoutes.DEVICE_CONFIGURATION,
origin: DeviceConfiguration.$devicesModuleOrigin,
data: {
device: device.id,
Expand Down
2 changes: 1 addition & 1 deletion public/lib/models/device-configuration/types.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { DataType } from '@fastybird/modules-metadata'
import { DataType } from '@fastybird/metadata'

import {
TJsonApiBody,
Expand Down
8 changes: 4 additions & 4 deletions public/lib/models/device-controls/index.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { RpCallResponse } from '@fastybird/vue-wamp-v1'
import * as exchangeEntitySchema
from '@fastybird/modules-metadata/resources/schemas/devices-module/entity.device.control.json'
from '@fastybird/metadata/resources/schemas/modules/devices-module/entity.device.control.json'
import {
ModuleOrigin,
DeviceControlEntity as ExchangeEntity,
DevicesModuleRoutes as RoutingKeys,
GlobalRoutes as GlobalRoutingKeys,
ActionRoutes,
DataType,
ControlAction,
} from '@fastybird/modules-metadata'
} from '@fastybird/metadata'

import {
ActionTree,
Expand Down Expand Up @@ -162,7 +162,7 @@ const moduleActions: ActionTree<DeviceControlState, unknown> = {

return new Promise((resolve, reject) => {
DeviceControl.wamp().call<{ data: string }>({
routing_key: GlobalRoutingKeys.DEVICES_CONTROL_DATA,
routing_key: ActionRoutes.DEVICE,
origin: DeviceControl.$devicesModuleOrigin,
data: {
action: ControlAction.SET,
Expand Down
8 changes: 4 additions & 4 deletions public/lib/models/device-properties/index.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
import { Item } from '@vuex-orm/core'
import { RpCallResponse } from '@fastybird/vue-wamp-v1'
import * as exchangeEntitySchema
from '@fastybird/modules-metadata/resources/schemas/devices-module/entity.device.property.json'
from '@fastybird/metadata/resources/schemas/modules/devices-module/entity.device.property.json'
import {
ModuleOrigin,
DevicePropertyEntity as ExchangeEntity,
DevicesModuleRoutes as RoutingKeys,
GlobalRoutes as GlobalRoutingKeys,
ActionRoutes,
DataType,
normalizeValue,
PropertyType,
PropertyAction,
} from '@fastybird/modules-metadata'
} from '@fastybird/metadata'

import {
ActionTree,
Expand Down Expand Up @@ -471,7 +471,7 @@ const moduleActions: ActionTree<DevicePropertyState, unknown> = {

return new Promise((resolve, reject) => {
DeviceProperty.wamp().call<{ data: string }>({
routing_key: GlobalRoutingKeys.DEVICES_PROPERTIES_DATA,
routing_key: ActionRoutes.DEVICE_PROPERTY,
origin: DeviceProperty.$devicesModuleOrigin,
data: {
action: PropertyAction.SET,
Expand Down
2 changes: 1 addition & 1 deletion public/lib/models/device-properties/types.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { DataType } from '@fastybird/modules-metadata'
import { DataType } from '@fastybird/metadata'

import {
TJsonApiBody,
Expand Down
2 changes: 1 addition & 1 deletion public/lib/models/devices/Device.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
HardwareManufacturer,
DeviceConnectionState,
DevicePropertyName,
} from '@fastybird/modules-metadata'
} from '@fastybird/metadata'

import capitalize from 'lodash/capitalize'

Expand Down
4 changes: 2 additions & 2 deletions public/lib/models/devices/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Item } from '@vuex-orm/core'
import * as exchangeEntitySchema from '@fastybird/modules-metadata/resources/schemas/devices-module/entity.device.json'
import * as exchangeEntitySchema from '@fastybird/metadata/resources/schemas/modules/devices-module/entity.device.json'
import {
ModuleOrigin,
DeviceEntity as ExchangeEntity,
Expand All @@ -9,7 +9,7 @@ import {
DeviceModel,
FirmwareManufacturer,
DeviceType,
} from '@fastybird/modules-metadata'
} from '@fastybird/metadata'

import {
ActionTree,
Expand Down
2 changes: 1 addition & 1 deletion public/lib/models/properties/Property.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Fields, Model } from '@vuex-orm/core'
import { DataType, HardwareManufacturer, normalizeValue } from '@fastybird/modules-metadata'
import { DataType, HardwareManufacturer, normalizeValue } from '@fastybird/metadata'

import {
PropertyCommandResult,
Expand Down
2 changes: 1 addition & 1 deletion public/lib/models/properties/types.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { DataType } from '@fastybird/modules-metadata'
import { DataType } from '@fastybird/metadata'

// ENTITY TYPES
// ============
Expand Down
2 changes: 1 addition & 1 deletion public/lib/types.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ModulePrefix } from '@fastybird/modules-metadata'
import { ModulePrefix } from '@fastybird/metadata'

import { TJsonaModel } from 'jsona/lib/JsonaTypes'

Expand Down

0 comments on commit 69fd17e

Please sign in to comment.