[ARVADOS-WORKBENCH2] updated: 1.2.0-915-g42db83a
Git user
git at public.curoverse.com
Wed Nov 21 04:27:21 EST 2018
Summary of changes:
src/models/ssh-key.ts | 8 --------
src/store/auth/auth-action.ts | 6 +++---
src/store/auth/auth-reducer.ts | 8 ++++----
src/views/ssh-key-panel/ssh-key-panel-root.tsx | 4 ++--
4 files changed, 9 insertions(+), 17 deletions(-)
via 42db83a0075f9704dcbfb2cd29821c97ff0fe34b (commit)
from 62ff5a943865229c1630c66366f824511048ce63 (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 42db83a0075f9704dcbfb2cd29821c97ff0fe34b
Author: Janicki Artur <artur.janicki at contractors.roche.com>
Date: Wed Nov 21 10:27:11 2018 +0100
remove SshKey interface and change object type
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 76d6ffd..8c2a3fd 100644
--- a/src/models/ssh-key.ts
+++ b/src/models/ssh-key.ts
@@ -4,14 +4,6 @@
import { Resource } from '~/models/resource';
-export interface SshKey {
- name: string;
- keyType: KeyType;
- authorizedUserUuid: string;
- publicKey: string;
- expiresAt: string;
-}
-
export interface SshKeyCreateFormDialogData {
publicKey: string;
name: string;
diff --git a/src/store/auth/auth-action.ts b/src/store/auth/auth-action.ts
index 64ee719..1a4ba0c 100644
--- a/src/store/auth/auth-action.ts
+++ b/src/store/auth/auth-action.ts
@@ -12,7 +12,7 @@ import { getCommonResourceServiceError, CommonResourceServiceError } from '~/ser
import { AxiosInstance } from "axios";
import { snackbarActions } from '~/store/snackbar/snackbar-actions';
import { dialogActions } from '~/store/dialog/dialog-actions';
-import { SshKeyCreateFormDialogData, SshKey, KeyType } from '~/models/ssh-key';
+import { SshKeyCreateFormDialogData, KeyType, SshKeyResource } from '~/models/ssh-key';
import { setBreadcrumbs } from '../breadcrumbs/breadcrumbs-actions';
export const authActions = unionize({
@@ -22,8 +22,8 @@ export const authActions = unionize({
INIT: ofType<{ user: User, token: string }>(),
USER_DETAILS_REQUEST: {},
USER_DETAILS_SUCCESS: ofType<User>(),
- SET_SSH_KEYS: ofType<SshKey[]>(),
- ADD_SSH_KEY: ofType<SshKey>()
+ SET_SSH_KEYS: ofType<SshKeyResource[]>(),
+ ADD_SSH_KEY: ofType<SshKeyResource>()
});
export const SSH_KEY_CREATE_FORM_NAME = 'sshKeyCreateFormName';
diff --git a/src/store/auth/auth-reducer.ts b/src/store/auth/auth-reducer.ts
index 8a30a2a..8f234da 100644
--- a/src/store/auth/auth-reducer.ts
+++ b/src/store/auth/auth-reducer.ts
@@ -5,12 +5,12 @@
import { authActions, AuthAction } from "./auth-action";
import { User } from "~/models/user";
import { ServiceRepository } from "~/services/services";
-import { SshKey } from '~/models/ssh-key';
+import { SshKeyResource } from '~/models/ssh-key';
export interface AuthState {
user?: User;
apiToken?: string;
- sshKeys?: SshKey[];
+ sshKeys?: SshKeyResource[];
}
const initialState: AuthState = {
@@ -36,10 +36,10 @@ export const authReducer = (services: ServiceRepository) => (state: AuthState =
USER_DETAILS_SUCCESS: (user: User) => {
return {...state, user};
},
- SET_SSH_KEYS: (sshKeys: SshKey[]) => {
+ SET_SSH_KEYS: (sshKeys: SshKeyResource[]) => {
return {...state, sshKeys};
},
- ADD_SSH_KEY: (sshKey: SshKey) => {
+ ADD_SSH_KEY: (sshKey: SshKeyResource) => {
return { ...state, sshKeys: state.sshKeys!.concat(sshKey) };
},
default: () => state
diff --git a/src/views/ssh-key-panel/ssh-key-panel-root.tsx b/src/views/ssh-key-panel/ssh-key-panel-root.tsx
index 90602de..f752228 100644
--- a/src/views/ssh-key-panel/ssh-key-panel-root.tsx
+++ b/src/views/ssh-key-panel/ssh-key-panel-root.tsx
@@ -5,7 +5,7 @@
import * as React from 'react';
import { StyleRulesCallback, WithStyles, withStyles, Card, CardContent, Button, Typography } from '@material-ui/core';
import { ArvadosTheme } from '~/common/custom-theme';
-import { SshKey } from '~/models/ssh-key';
+import { SshKeyResource } from '~/models/ssh-key';
type CssRules = 'root' | 'link';
@@ -26,7 +26,7 @@ export interface SshKeyPanelRootActionProps {
}
export interface SshKeyPanelRootDataProps {
- sshKeys?: SshKey[];
+ sshKeys?: SshKeyResource[];
}
type SshKeyPanelRootProps = SshKeyPanelRootDataProps & SshKeyPanelRootActionProps & WithStyles<CssRules>;
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list