use correct imports and put permission types to ui-components

scm-ui-components/packages/ui-types/src/RepositoryPermissions.js

@@ -1,11 +1,11 @@
 //@flow
-import type { Links } from "../../types/hal";
+import type { Links } from "./hal";
 
 export type Permission = {
   name: string,
   type: string,
   groupPermission: boolean,
-  _links: Links
+  _links?: Links
 };
 
 export type PermissionEntry = {

scm-ui-components/packages/ui-types/src/index.js

@@ -10,3 +10,5 @@ export type { Repository, RepositoryCollection, RepositoryGroup } from "./Reposi
 export type { RepositoryType, RepositoryTypeCollection } from "./RepositoryTypes";
 
 export type { Config } from "./Config";
+
+export type { Permission, PermissionEntry, PermissionCollection } from "./RepositoryPermissions";

scm-ui/src/repos/permissions/components/CreatePermissionForm.js

@@ -1,16 +1,12 @@
 // @flow
 import React from "react";
 import { translate } from "react-i18next";
-import {
+import { Checkbox, InputField, SubmitButton } from "@scm-manager/ui-components";
-  Checkbox,
-  InputField,
-  SubmitButton
-} from "../../../../../scm-ui-components/packages/ui-components/src/index";
 import TypeSelector from "./TypeSelector";
 import type {
   PermissionCollection,
   PermissionEntry
-} from "../types/Permissions";
+} from "@scm-manager/ui-types";
 
 type Props = {
   t: string => string,

scm-ui/src/repos/permissions/components/TypeSelector.js

@@ -3,7 +3,7 @@ import React from "react";
 import { translate } from "react-i18next";
 import {
   Select
-} from "../../../../../scm-ui-components/packages/ui-components/src/index";
+} from "@scm-manager/ui-components";
 
 type Props = {
   t: string => string,

scm-ui/src/repos/permissions/components/buttons/DeletePermissionButton.js

@@ -1,7 +1,7 @@
 // @flow
 import React from "react";
 import { translate } from "react-i18next";
-import type { Permission } from "../../types/Permissions";
+import type { Permission } from "@scm-manager/ui-types";
 import { confirmAlert, DeleteButton } from "@scm-manager/ui-components";
 
 type Props = {

scm-ui/src/repos/permissions/containers/Permissions.js

@@ -17,12 +17,12 @@ import {
   modifyPermissionReset,
   deletePermissionReset
 } from "../modules/permissions";
-import { Loading, ErrorPage } from "../../../../../scm-ui-components/packages/ui-components/src/index";
+import { Loading, ErrorPage } from "@scm-manager/ui-components";
 import type {
   Permission,
   PermissionCollection,
   PermissionEntry
-} from "../types/Permissions";
+} from "@scm-manager/ui-types";
 import SinglePermission from "./SinglePermission";
 import CreatePermissionForm from "../components/CreatePermissionForm";
 import type { History } from "history";

scm-ui/src/repos/permissions/containers/SinglePermission.js

@@ -1,6 +1,6 @@
 // @flow
 import React from "react";
-import type { Permission } from "../types/Permissions";
+import type { Permission } from "@scm-manager/ui-types";
 import { translate } from "react-i18next";
 import {
   modifyPermission,
@@ -10,7 +10,7 @@ import {
 } from "../modules/permissions";
 import { connect } from "react-redux";
 import type { History } from "history";
-import { Checkbox } from "../../../../../scm-ui-components/packages/ui-components/src/index";
+import { Checkbox } from "@scm-manager/ui-components";
 import DeletePermissionButton from "../components/buttons/DeletePermissionButton";
 import TypeSelector from "../components/TypeSelector";
 

scm-ui/src/repos/permissions/modules/permissions.js

@@ -1,13 +1,13 @@
 // @flow
 
-import { apiClient } from "../../../../../scm-ui-components/packages/ui-components/src/index";
+import { apiClient } from "@scm-manager/ui-components";
 import * as types from "../../../modules/types";
-import type { Action } from "../../../../../scm-ui-components/packages/ui-types/src/index";
+import type { Action } from "@scm-manager/ui-components";
 import type {
   PermissionCollection,
   Permission,
   PermissionEntry
-} from "../types/Permissions";
+} from "@scm-manager/ui-types";
 import { isPending } from "../../../modules/pending";
 import { getFailure } from "../../../modules/failure";
 import { Dispatch } from "redux";

scm-ui/src/repos/permissions/modules/permissions.test.js

@@ -40,7 +40,7 @@ import reducer, {
   isCreatePermissionPending,
   getDeletePermissionsFailure
 } from "./permissions";
-import type { Permission, PermissionCollection } from "../types/Permissions";
+import type { Permission, PermissionCollection } from "@scm-manager/ui-types";
 
 const hitchhiker_puzzle42Permission_user_eins: Permission = {
   name: "user_eins",