[ARVADOS-WORKBENCH2] updated: 1.2.0-917-g65bdf25
Git user
git at public.curoverse.com
Wed Nov 21 06:09:26 EST 2018
Summary of changes:
src/models/ssh-key.ts | 5 -----
src/store/auth/auth-action.ts | 7 ++++++-
src/views-components/dialog-create/dialog-ssh-key-create.tsx | 2 +-
src/views-components/dialog-forms/create-ssh-key-dialog.ts | 3 +--
4 files changed, 8 insertions(+), 9 deletions(-)
via 65bdf250e5a09633e482bacd968666861643c150 (commit)
from 13bf073c77ca9fcf75ebd31098a9bf538e96c9c9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 65bdf250e5a09633e482bacd968666861643c150
Author: Janicki Artur <artur.janicki at contractors.roche.com>
Date: Wed Nov 21 12:09:20 2018 +0100
move ssh form interface from model to action
Feature #14479_ssh_keys
Arvados-DCO-1.1-Signed-off-by: Janicki Artur <artur.janicki at contractors.roche.com>
diff --git a/src/models/ssh-key.ts b/src/models/ssh-key.ts
index 8c2a3fd..8ccbd92 100644
--- a/src/models/ssh-key.ts
+++ b/src/models/ssh-key.ts
@@ -4,11 +4,6 @@
import { Resource } from '~/models/resource';
-export interface SshKeyCreateFormDialogData {
- publicKey: string;
- name: string;
-}
-
export enum KeyType {
SSH = 'SSH'
}
diff --git a/src/store/auth/auth-action.ts b/src/store/auth/auth-action.ts
index 00e372a..3658c58 100644
--- a/src/store/auth/auth-action.ts
+++ b/src/store/auth/auth-action.ts
@@ -12,7 +12,7 @@ import { dialogActions } from '~/store/dialog/dialog-actions';
import { setBreadcrumbs } from '~/store/breadcrumbs/breadcrumbs-actions';
import { ServiceRepository } from "~/services/services";
import { getAuthorizedKeysServiceError, AuthorizedKeysServiceError } from '~/services/authorized-keys-service/authorized-keys-service';
-import { SshKeyCreateFormDialogData, KeyType, SshKeyResource } from '~/models/ssh-key';
+import { KeyType, SshKeyResource } from '~/models/ssh-key';
import { User } from "~/models/user";
export const authActions = unionize({
@@ -28,6 +28,11 @@ export const authActions = unionize({
export const SSH_KEY_CREATE_FORM_NAME = 'sshKeyCreateFormName';
+export interface SshKeyCreateFormDialogData {
+ publicKey: string;
+ name: string;
+}
+
function setAuthorizationHeader(services: ServiceRepository, token: string) {
services.apiClient.defaults.headers.common = {
Authorization: `OAuth2 ${token}`
diff --git a/src/views-components/dialog-create/dialog-ssh-key-create.tsx b/src/views-components/dialog-create/dialog-ssh-key-create.tsx
index 28c3a36..b7c9b1f 100644
--- a/src/views-components/dialog-create/dialog-ssh-key-create.tsx
+++ b/src/views-components/dialog-create/dialog-ssh-key-create.tsx
@@ -7,7 +7,7 @@ import { InjectedFormProps } from 'redux-form';
import { WithDialogProps } from '~/store/dialog/with-dialog';
import { FormDialog } from '~/components/form-dialog/form-dialog';
import { SshKeyPublicField, SshKeyNameField } from '~/views-components/form-fields/ssh-key-form-fields';
-import { SshKeyCreateFormDialogData } from '~/models/ssh-key';
+import { SshKeyCreateFormDialogData } from '~/store/auth/auth-action';
type DialogSshKeyProps = WithDialogProps<{}> & InjectedFormProps<SshKeyCreateFormDialogData>;
diff --git a/src/views-components/dialog-forms/create-ssh-key-dialog.ts b/src/views-components/dialog-forms/create-ssh-key-dialog.ts
index bc436d9..e965243 100644
--- a/src/views-components/dialog-forms/create-ssh-key-dialog.ts
+++ b/src/views-components/dialog-forms/create-ssh-key-dialog.ts
@@ -5,9 +5,8 @@
import { compose } from "redux";
import { reduxForm } from 'redux-form';
import { withDialog } from "~/store/dialog/with-dialog";
-import { SSH_KEY_CREATE_FORM_NAME, createSshKey } from '~/store/auth/auth-action';
+import { SSH_KEY_CREATE_FORM_NAME, createSshKey, SshKeyCreateFormDialogData } from '~/store/auth/auth-action';
import { DialogSshKeyCreate } from '~/views-components/dialog-create/dialog-ssh-key-create';
-import { SshKeyCreateFormDialogData } from '~/models/ssh-key';
export const CreateSshKeyDialog = compose(
withDialog(SSH_KEY_CREATE_FORM_NAME),
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list