Rename Non-packaged libraries to be under "common"

Dockerfile

@@ -19,7 +19,7 @@ COPY apps/backend/package.json apps/backend/tsconfig.* ./apps/backend/
 COPY apps/frontend/package.json apps/frontend/tsconfig.* ./apps/frontend/
 COPY libs/hdf-converters/package.json libs/hdf-converters/tsconfig.* ./libs/hdf-converters/
 COPY libs/inspecjs/package.json libs/inspecjs/tsconfig.* ./libs/inspecjs/
-COPY libs/interfaces/package.json libs/interfaces/tsconfig.json ./libs/interfaces/
+COPY libs/common/package.json libs/common/tsconfig.json ./libs/common/
 COPY libs/password-complexity/package.json ./libs/password-complexity/
 
 RUN sed -i s^https://registry.yarnpkg.com^$YARNREPO^g yarn.lock

Dockerfile.lite

@@ -19,7 +19,7 @@ COPY package.json yarn.lock lerna.json tsconfig.json postcss.config.js ./
 COPY apps/frontend/package.json apps/frontend/tsconfig.json ./apps/frontend/
 COPY libs/hdf-converters/package.json libs/hdf-converters/tsconfig.* ./libs/hdf-converters/
 COPY libs/inspecjs/package.json libs/inspecjs/tsconfig.* ./libs/inspecjs/
-COPY libs/interfaces/package.json libs/interfaces/tsconfig.json ./libs/interfaces/
+COPY libs/common/package.json libs/common/tsconfig.* ./libs/common/
 COPY libs/password-complexity/package.json ./libs/password-complexity/
 
 RUN sed -i s^https://registry.yarnpkg.com^$YARNREPO^g yarn.lock

apps/backend/package.json

@@ -45,7 +45,7 @@
   },
   "dependencies": {
     "@casl/ability": "^6.0.0",
-    "@heimdall/interfaces": "^2.10.16",
+    "@heimdall/common": "^2.11.1",
     "@heimdall/password-complexity": "^2.6.6",
     "@nestjs/cli": "^10.1.14",
     "@nestjs/common": "^10.2.1",

apps/backend/src/apikeys/dto/apikey.dto.ts

@@ -1,4 +1,4 @@
-import {IApiKey} from '@heimdall/interfaces';
+import {IApiKey} from '@heimdall/common/interfaces';
 import {ApiKey} from '../apikey.model';
 
 export class APIKeyDto implements IApiKey {

apps/backend/src/apikeys/dto/create-apikey.dto.ts

@@ -1,4 +1,4 @@
-import {ICreateApiKey} from '@heimdall/interfaces';
+import {ICreateApiKey} from '@heimdall/common/interfaces';
 import {IsOptional, IsString} from 'class-validator';
 
 export class CreateApiKeyDto implements ICreateApiKey {

apps/backend/src/apikeys/dto/delete-apikey.dto.ts

@@ -1,4 +1,4 @@
-import {IDeleteApiKey} from '@heimdall/interfaces';
+import {IDeleteApiKey} from '@heimdall/common/interfaces';
 import {IsOptional, IsString} from 'class-validator';
 
 export class DeleteAPIKeyDto implements IDeleteApiKey {

apps/backend/src/apikeys/dto/update-apikey.dto.ts

@@ -1,4 +1,4 @@
-import {IUpdateAPIKey} from '@heimdall/interfaces';
+import {IUpdateAPIKey} from '@heimdall/common/interfaces';
 import {IsOptional, IsString} from 'class-validator';
 
 export class UpdateAPIKeyDto implements IUpdateAPIKey {

apps/backend/src/authn/jwt.strategy.ts

@@ -1,4 +1,4 @@
-import {IUser} from '@heimdall/interfaces';
+import {IUser} from '@heimdall/common/interfaces';
 import {HttpException, Injectable, UnauthorizedException} from '@nestjs/common';
 import {PassportStrategy} from '@nestjs/passport';
 import jwt from 'jsonwebtoken';

apps/backend/src/config/dto/startup-settings.dto.ts

@@ -1,4 +1,4 @@
-import {IStartupSettings} from '@heimdall/interfaces';
+import {IStartupSettings} from '@heimdall/common/interfaces';
 
 export class StartupSettingsDto implements IStartupSettings {
   readonly apiKeysEnabled: boolean;

apps/backend/src/evaluation-tags/dto/create-evaluation-tag.dto.ts

@@ -1,4 +1,4 @@
-import {ICreateEvaluationTag} from '@heimdall/interfaces';
+import {ICreateEvaluationTag} from '@heimdall/common/interfaces';
 import {IsNotEmpty, IsString} from 'class-validator';
 
 export class CreateEvaluationTagDto implements ICreateEvaluationTag {

apps/backend/src/evaluation-tags/dto/delete-evaluation-tag.dto.ts

@@ -1,4 +1,4 @@
-import {IDeleteEvaluationTag} from '@heimdall/interfaces';
+import {IDeleteEvaluationTag} from '@heimdall/common/interfaces';
 import {IsNotEmpty, IsNumberString, IsString, Min} from 'class-validator';
 
 export class DeleteEvaluationTagDto implements IDeleteEvaluationTag {

apps/backend/src/evaluation-tags/dto/evaluation-tag.dto.ts

@@ -1,4 +1,4 @@
-import {IEvaluationTag} from '@heimdall/interfaces';
+import {IEvaluationTag} from '@heimdall/common/interfaces';
 import {EvaluationTag} from '../evaluation-tag.model';
 
 export class EvaluationTagDto implements IEvaluationTag {

apps/backend/src/evaluations/dto/create-evaluation.dto.ts

@@ -1,4 +1,4 @@
-import {ICreateEvaluation} from '@heimdall/interfaces';
+import {ICreateEvaluation} from '@heimdall/common/interfaces';
 import {
   IsArray,
   IsBoolean,

apps/backend/src/evaluations/dto/evaluation.dto.ts

@@ -1,4 +1,4 @@
-import {IEvaluation} from '@heimdall/interfaces';
+import {IEvaluation} from '@heimdall/common/interfaces';
 import {EvaluationTagDto} from '../../evaluation-tags/dto/evaluation-tag.dto';
 import {GroupDto} from '../../groups/dto/group.dto';
 import {Group} from '../../groups/group.model';

apps/backend/src/evaluations/dto/update-evaluation.dto.ts

@@ -1,4 +1,4 @@
-import {IUpdateEvaluation} from '@heimdall/interfaces';
+import {IUpdateEvaluation} from '@heimdall/common/interfaces';
 import {IsBoolean, IsObject, IsOptional, IsString} from 'class-validator';
 
 export class UpdateEvaluationDto implements IUpdateEvaluation {

apps/backend/src/groups/dto/add-user-to-group.dto.ts

@@ -1,4 +1,4 @@
-import {IAddUserToGroup} from '@heimdall/interfaces';
+import {IAddUserToGroup} from '@heimdall/common/interfaces';
 import {IsNotEmpty, IsString} from 'class-validator';
 
 export class AddUserToGroupDto implements IAddUserToGroup {

apps/backend/src/groups/dto/create-group.dto.ts

@@ -1,4 +1,4 @@
-import {ICreateGroup} from '@heimdall/interfaces';
+import {ICreateGroup} from '@heimdall/common/interfaces';
 import {IsBoolean, IsNotEmpty, IsOptional, IsString} from 'class-validator';
 
 export class CreateGroupDto implements ICreateGroup {

apps/backend/src/groups/dto/evaluation-group.dto.ts

@@ -1,4 +1,4 @@
-import {IEvaluationGroup} from '@heimdall/interfaces';
+import {IEvaluationGroup} from '@heimdall/common/interfaces';
 import {IsNotEmpty, IsString} from 'class-validator';
 
 export class EvaluationGroupDto implements IEvaluationGroup {

apps/backend/src/groups/dto/group.dto.ts

@@ -1,4 +1,4 @@
-import {IGroup} from '@heimdall/interfaces';
+import {IGroup} from '@heimdall/common/interfaces';
 import {GroupUser} from '../../group-users/group-user.model';
 import {SlimUserDto} from '../../users/dto/slim-user.dto';
 import {Group} from '../group.model';

apps/backend/src/groups/dto/remove-user-from-group.dto.ts

@@ -1,4 +1,4 @@
-import {IRemoveUserFromGroup} from '@heimdall/interfaces';
+import {IRemoveUserFromGroup} from '@heimdall/common/interfaces';
 import {IsNotEmpty, IsString} from 'class-validator';
 
 export class RemoveUserFromGroupDto implements IRemoveUserFromGroup {

apps/backend/src/groups/dto/update-group-user.dto.ts

@@ -1,4 +1,4 @@
-import {IUpdateGroupUser} from '@heimdall/interfaces';
+import {IUpdateGroupUser} from '@heimdall/common/interfaces';
 import {IsNotEmpty, IsString} from 'class-validator';
 
 export class UpdateGroupUserRoleDto implements IUpdateGroupUser {

apps/backend/src/interceptors/create-evaluation-interceptor.ts

@@ -1,4 +1,4 @@
-import {ICreateEvaluation} from '@heimdall/interfaces';
+import {ICreateEvaluation} from '@heimdall/common/interfaces';
 import {
   CallHandler,
   ExecutionContext,

apps/backend/src/statistics/dto/statistics.dto.ts

@@ -1,4 +1,4 @@
-import {IStatistics} from '@heimdall/interfaces';
+import {IStatistics} from '@heimdall/common/interfaces';
 
 export class StatisticsDTO implements IStatistics {
   readonly apiKeyCount: number;

apps/backend/src/users/dto/create-user.dto.ts

@@ -1,4 +1,4 @@
-import {ICreateUser} from '@heimdall/interfaces';
+import {ICreateUser} from '@heimdall/common/interfaces';
 import {IsEmail, IsIn, IsNotEmpty, IsOptional, IsString} from 'class-validator';
 
 export class CreateUserDto implements ICreateUser {

apps/backend/src/users/dto/delete-user.dto.ts

@@ -1,4 +1,4 @@
-import {IDeleteUser} from '@heimdall/interfaces';
+import {IDeleteUser} from '@heimdall/common/interfaces';
 import {IsOptional, IsString, MinLength} from 'class-validator';
 
 export class DeleteUserDto implements IDeleteUser {

apps/backend/src/users/dto/slim-user.dto.ts

@@ -1,4 +1,4 @@
-import {ISlimUser} from '@heimdall/interfaces';
+import {ISlimUser} from '@heimdall/common/interfaces';
 import {IsOptional, IsString} from 'class-validator';
 import {User} from '../user.model';
 

apps/backend/src/users/dto/update-user.dto.ts

@@ -1,4 +1,4 @@
-import {IUpdateUser} from '@heimdall/interfaces';
+import {IUpdateUser} from '@heimdall/common/interfaces';
 import {IsBoolean, IsEmail, IsIn, IsOptional, IsString} from 'class-validator';
 
 export class UpdateUserDto implements IUpdateUser {

apps/backend/src/users/dto/user.dto.ts

@@ -1,4 +1,4 @@
-import {IUser} from '@heimdall/interfaces';
+import {IUser} from '@heimdall/common/interfaces';
 import {User} from '../user.model';
 
 export class UserDto implements IUser {

apps/frontend/package.json

@@ -32,7 +32,7 @@
     "@aws-sdk/client-s3": "^3.425.0",
     "@aws-sdk/client-sts": "^3.427.0",
     "@e965/xlsx": "^0.20.0",
-    "@heimdall/interfaces": "^2.10.16",
+    "@heimdall/common": "^2.11.1",
     "@mdi/font": "^7.0.96",
     "@mdi/js": "^7.0.96",
     "@types/chroma-js": "^2.1.0",

apps/frontend/src/components/cards/EvaluationInfo.vue

@@ -57,7 +57,7 @@ import {
   SourcedContextualizedEvaluation,
   SourcedContextualizedProfile
 } from '@/store/report_intake';
-import {IEvaluation} from '@heimdall/interfaces';
+import {IEvaluation} from '@heimdall/common/interfaces';
 import {ContextualizedEvaluation} from 'inspecjs';
 import * as _ from 'lodash';
 import Vue from 'vue';

apps/frontend/src/components/global/TopbarDropdown.vue

@@ -99,7 +99,7 @@ import IconLinkItem from '@/components/global/sidebaritems/IconLinkItem.vue';
 import UserModal from '@/components/global/UserModal.vue';
 import ServerMixin from '@/mixins/ServerMixin';
 import {ServerModule} from '@/store/server';
-import {IUser} from '@heimdall/interfaces';
+import {IUser} from '@heimdall/common/interfaces';
 import Component, {mixins} from 'vue-class-component';
 
 @Component({

apps/frontend/src/components/global/UserModal.vue

@@ -247,7 +247,7 @@ import InputDialog from '@/components/generic/InputDialog.vue';
 import UserValidatorMixin from '@/mixins/UserValidatorMixin';
 import {ServerModule} from '@/store/server';
 import {SnackbarModule} from '@/store/snackbar';
-import {IApiKey, IUpdateUser, IUser} from '@heimdall/interfaces';
+import {IApiKey, IUpdateUser, IUser} from '@heimdall/common/interfaces';
 import axios from 'axios';
 import Vue from 'vue';
 import Component from 'vue-class-component';

apps/frontend/src/components/global/admin/Statistics.vue

@@ -20,7 +20,7 @@
 </template>
 
 <script lang="ts">
-import {IStatistics} from '@heimdall/interfaces';
+import {IStatistics} from '@heimdall/common/interfaces';
 import axios from 'axios';
 import Vue from 'vue';
 import {Component} from 'vue-property-decorator';

apps/frontend/src/components/global/admin/UserManagement.vue

@@ -74,7 +74,7 @@ import RegistrationModal from '@/components/global/RegistrationModal.vue';
 import IconLinkItem from '@/components/global/sidebaritems/IconLinkItem.vue';
 import UserModal from '@/components/global/UserModal.vue';
 import {SnackbarModule} from '@/store/snackbar';
-import {IUser} from '@heimdall/interfaces';
+import {IUser} from '@heimdall/common/interfaces';
 import axios from 'axios';
 import Vue from 'vue';
 import Component from 'vue-class-component';

apps/frontend/src/components/global/groups/GroupAPIKeysModal.vue

@@ -112,7 +112,7 @@ import ActionDialog from '@/components/generic/ActionDialog.vue';
 import Users from '@/components/global/groups/Users.vue';
 import CopyButton from '@/components/generic/CopyButton.vue';
 import {SnackbarModule} from '@/store/snackbar';
-import {IApiKey, IGroup} from '@heimdall/interfaces';
+import {IApiKey, IGroup} from '@heimdall/common/interfaces';
 import axios from 'axios';
 import Vue from 'vue';
 import Component from 'vue-class-component';

apps/frontend/src/components/global/groups/GroupManagement.vue

@@ -155,7 +155,7 @@ import GroupUsers from '@/components/global/groups/GroupUsers.vue';
 import Users from '@/components/global/groups/Users.vue';
 import {GroupsModule} from '@/store/groups';
 import {SnackbarModule} from '@/store/snackbar';
-import {IGroup, ISlimUser} from '@heimdall/interfaces';
+import {IGroup, ISlimUser} from '@heimdall/common/interfaces';
 import Vue from 'vue';
 import Component from 'vue-class-component';
 import {Prop} from 'vue-property-decorator';

apps/frontend/src/components/global/groups/GroupModal.vue

@@ -114,7 +114,7 @@ import {
   IRemoveUserFromGroup,
   ISlimUser,
   IUpdateGroupUser
-} from '@heimdall/interfaces';
+} from '@heimdall/common/interfaces';
 import axios, {AxiosResponse} from 'axios';
 import * as _ from 'lodash';
 import Vue from 'vue';

apps/frontend/src/components/global/groups/GroupRow.vue

@@ -15,7 +15,7 @@
 </template>
 
 <script lang="ts">
-import {IEvaluation} from '@heimdall/interfaces';
+import {IEvaluation} from '@heimdall/common/interfaces';
 import Component, {mixins} from 'vue-class-component';
 import {Prop} from 'vue-property-decorator';
 import EvaluationMixin from '../../../mixins/EvaluationMixin';

apps/frontend/src/components/global/groups/GroupUsers.vue

@@ -32,7 +32,7 @@
 
 <script lang="ts">
 import Users from '@/components/global/groups/Users.vue';
-import {ISlimUser} from '@heimdall/interfaces';
+import {ISlimUser} from '@heimdall/common/interfaces';
 import Vue from 'vue';
 import Component from 'vue-class-component';
 import {Prop, VModel} from 'vue-property-decorator';

apps/frontend/src/components/global/groups/Users.vue

@@ -61,7 +61,7 @@
 
 <script lang="ts">
 import ActionDialog from '@/components/generic/ActionDialog.vue';
-import {ISlimUser} from '@heimdall/interfaces';
+import {ISlimUser} from '@heimdall/common/interfaces';
 import Component from 'vue-class-component';
 import {Emit, Prop, VModel} from 'vue-property-decorator';
 import {ServerModule} from '@/store/server';

apps/frontend/src/components/global/sidebaritems/SidebarFileList.vue

@@ -40,7 +40,7 @@ import {InspecDataModule} from '@/store/data_store';
 import {EvaluationModule} from '@/store/evaluations';
 import {EvaluationFile, ProfileFile} from '@/store/report_intake';
 import {SnackbarModule} from '@/store/snackbar';
-import {ICreateEvaluation, IEvaluation} from '@heimdall/interfaces';
+import {ICreateEvaluation, IEvaluation} from '@heimdall/common/interfaces';
 import axios from 'axios';
 import * as _ from 'lodash';
 import Component, {mixins} from 'vue-class-component';

apps/frontend/src/components/global/tags/TagRow.vue

@@ -66,7 +66,7 @@
 import ActionDialog from '@/components/generic/ActionDialog.vue';
 import {EvaluationModule} from '@/store/evaluations';
 import {SnackbarModule} from '@/store/snackbar';
-import {IEvaluation, IEvaluationTag} from '@heimdall/interfaces';
+import {IEvaluation, IEvaluationTag} from '@heimdall/common/interfaces';
 import Vue from 'vue';
 import Component from 'vue-class-component';
 import {Prop} from 'vue-property-decorator';

apps/frontend/src/components/global/upload_tabs/DatabaseReader.vue

@@ -91,7 +91,7 @@ import {FileID} from '@/store/report_intake';
 import {SnackbarModule} from '@/store/snackbar';
 import {EvaluationModule} from '@/store/evaluations';
 import {SpinnerModule} from '@/store/spinner';
-import {IEvalPaginationParams, IEvaluation} from '@heimdall/interfaces';
+import {IEvalPaginationParams, IEvaluation} from '@heimdall/common/interfaces';
 import {Prop, Watch} from 'vue-property-decorator';
 import Component, {mixins} from 'vue-class-component';
 

apps/frontend/src/components/global/upload_tabs/EditEvaluationModal.vue

@@ -99,7 +99,7 @@ import {EvaluationModule} from '@/store/evaluations';
 import {GroupsModule} from '@/store/groups';
 import {SnackbarModule} from '@/store/snackbar';
 import {IVuetifyItems} from '@/utilities/helper_util';
-import {IEvaluation, IEvaluationGroup} from '@heimdall/interfaces';
+import {IEvaluation, IEvaluationGroup} from '@heimdall/common/interfaces';
 import axios from 'axios';
 import Component, {mixins} from 'vue-class-component';
 import {Prop} from 'vue-property-decorator';

apps/frontend/src/components/global/upload_tabs/LoadFileList.vue

@@ -273,7 +273,7 @@ import {
   IEvalPaginationParams,
   IEvaluation,
   IEvaluationTag
-} from '@heimdall/interfaces';
+} from '@heimdall/common/interfaces';
 import {Prop} from 'vue-property-decorator';
 import Component, {mixins} from 'vue-class-component';
 import {FilteredDataModule} from '../../../store/data_filters';

apps/frontend/src/mixins/EvaluationMixin.ts

@@ -1,5 +1,5 @@
 import {GroupsModule} from '@/store/groups';
-import {IGroup} from '@heimdall/interfaces';
+import {IGroup} from '@heimdall/common/interfaces';
 import {intersectionBy} from 'lodash';
 import {Component, Vue} from 'vue-property-decorator';
 import {IVuetifyItems} from '../utilities/helper_util';

apps/frontend/src/store/evaluations.ts

@@ -6,7 +6,7 @@ import {
   IEvaluation,
   IEvaluationResponse,
   IEvaluationTag
-} from '@heimdall/interfaces';
+} from '@heimdall/common/interfaces';
 import axios from 'axios';
 import * as _ from 'lodash';
 import {

apps/frontend/src/store/groups.ts

@@ -1,5 +1,5 @@
 import Store from '@/store/store';
-import {IGroup} from '@heimdall/interfaces';
+import {IGroup} from '@heimdall/common/interfaces';
 import axios, {AxiosResponse} from 'axios';
 import {
   Action,

apps/frontend/src/store/server.ts

@@ -5,7 +5,7 @@ import {
   IStartupSettings,
   IUpdateUser,
   IUser
-} from '@heimdall/interfaces';
+} from '@heimdall/common/interfaces';
 import axios from 'axios';
 import Vue from 'vue';
 import {

apps/frontend/src/views/Compare.vue

@@ -231,7 +231,7 @@ import {
   get_eval_start_time
 } from '@/utilities/delta_util';
 import Base from '@/views/Base.vue';
-import {IEvaluation} from '@heimdall/interfaces';
+import {IEvaluation} from '@heimdall/common/interfaces';
 import {ControlStatus} from 'inspecjs';
 import * as _ from 'lodash';
 import Vue from 'vue';

apps/frontend/src/views/Results.vue

@@ -238,7 +238,7 @@ import {
 import {SearchModule} from '@/store/search';
 import {ServerModule} from '@/store/server';
 import Base from '@/views/Base.vue';
-import {IEvaluation} from '@heimdall/interfaces';
+import {IEvaluation} from '@heimdall/common/interfaces';
 import {Severity} from 'inspecjs';
 import {capitalize} from 'lodash';
 import Component, {mixins} from 'vue-class-component';

heimdall2.code-workspace

@@ -17,6 +17,10 @@
       "name": "InspecJS",
       "path": "libs/inspecjs"
     },
+    {
+      "name": "Common",
+      "path": "libs/common"
+    },
     {
       "name": "Heimdall",
       "path": "."

libs/common/index.ts

@@ -0,0 +1 @@
+export * from './interfaces';