Skip to content
This repository has been archived by the owner on Jan 16, 2022. It is now read-only.

Commit

Permalink
fix: remove any types and added additional component state interfaces
Browse files Browse the repository at this point in the history
  • Loading branch information
griffithtp committed Jun 24, 2019
1 parent 3c54b11 commit 116055c
Show file tree
Hide file tree
Showing 11 changed files with 22 additions and 21 deletions.
5 changes: 3 additions & 2 deletions jest/unit/components/__mocks__/api.ts
Expand Up @@ -39,8 +39,9 @@ const register = (url, method = 'get', options = {}) => {
* Bind API methods
*/
class API {
request() {
return register.call(null, ...arguments);
public request() {
const rest = arguments;
return register.call(null, ...rest);
}
}

Expand Down
2 changes: 1 addition & 1 deletion jest/unit/components/store/logo.ts
Expand Up @@ -2,6 +2,6 @@
* Mock response for logo api
* @returns {promise}
*/
export default function() {
export default function<T>(): Promise<T> {
return Promise.resolve('http://localhost/-/static/logo.png');
}
2 changes: 1 addition & 1 deletion src/App/App.test.tsx
Expand Up @@ -7,7 +7,7 @@ import { generateTokenWithTimeRange } from '../../jest/unit/components/__mocks__

jest.mock('../utils/storage', () => {
class LocalStorageMock {
store: object;
private store: object;
public constructor() {
this.store = {};
}
Expand Down
2 changes: 1 addition & 1 deletion src/App/App.tsx
Expand Up @@ -19,7 +19,7 @@ export const AppContext = React.createContext<null>(null);
export const AppContextProvider = AppContext.Provider;
export const AppContextConsumer = AppContext.Consumer;

export default class App extends Component<any, any> {
export default class App extends Component {
public state = {
error: {},
// @ts-ignore
Expand Down
4 changes: 2 additions & 2 deletions src/components/DetailContainer/DetailContainer.tsx
Expand Up @@ -14,7 +14,7 @@ interface DetailContainerState {
tabPosition: number;
}

class DetailContainer extends Component<any, DetailContainerState> {
class DetailContainer<P> extends Component<P, DetailContainerState> {
public state = {
tabPosition: 0,
};
Expand All @@ -29,7 +29,7 @@ class DetailContainer extends Component<any, DetailContainerState> {
);
}

private handleChange = (event: any, tabPosition: number) => {
private handleChange = (event: React.ChangeEvent<{}>, tabPosition: number) => {
event.preventDefault();
this.setState({ tabPosition });
};
Expand Down
2 changes: 1 addition & 1 deletion src/components/RegistryInfoDialog/RegistryInfoDialog.tsx
Expand Up @@ -8,7 +8,7 @@ import { Props } from './types';

const LABEL = 'CLOSE';

const RegistryInfoDialog: React.FC<Props> = ({ open = false, children, onClose }): any => (
const RegistryInfoDialog: React.FC<Props> = ({ open = false, children, onClose }) => (
<Dialog id="registryInfo--dialog-container" onClose={onClose} open={open}>
<Title disableTypography={true}>{'Register Info'}</Title>
<Content>{children}</Content>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Search/Search.test.tsx
Expand Up @@ -154,7 +154,7 @@ describe('<Search /> component test', () => {
beforeEach(() => {
jest.resetModules();
jest.doMock('lodash/debounce', () => {
return function debounceMock(fn, delay) {
return function debounceMock(fn) {
return fn;
};
});
Expand Down
6 changes: 3 additions & 3 deletions src/pages/version/Version.tsx
Expand Up @@ -39,7 +39,7 @@ interface StateInterface {
notFound: boolean;
}

class VersionPage extends Component<PropsInterface, StateInterface> {
class VersionPage extends Component<PropsInterface, Partial<StateInterface>> {
constructor(props) {
super(props);

Expand Down Expand Up @@ -81,7 +81,7 @@ class VersionPage extends Component<PropsInterface, StateInterface> {
public async componentDidUpdate(nextProps, prevState: StateInterface): Promise<void> {
const { packageName } = this.state;
if (packageName !== prevState.packageName) {
const { readMe, packageMeta } = await callDetailPage(packageName);
const { readMe, packageMeta } = (await callDetailPage(packageName)) as Partial<StateInterface>;
this.setState({
readMe,
packageMeta,
Expand Down Expand Up @@ -125,7 +125,7 @@ class VersionPage extends Component<PropsInterface, StateInterface> {
});

try {
const { readMe, packageMeta } = await callDetailPage(packageName);
const { readMe, packageMeta } = (await callDetailPage(packageName)) as Partial<StateInterface>;
this.setState({
readMe,
packageMeta,
Expand Down
12 changes: 6 additions & 6 deletions src/utils/api.ts
Expand Up @@ -25,24 +25,24 @@ function handleResponseType(response: Response): Promise<[boolean, Blob | string
}

class API {
public request(url: string, method = 'GET', options: any = {}): Promise<any> {
public request<T>(url: string, method = 'GET', options?: RequestInit): Promise<T> {
if (!window.VERDACCIO_API_URL) {
throw new Error('VERDACCIO_API_URL is not defined!');
}

const token = storage.getItem('token');
if (token) {
if (!options.headers) options.headers = {};

options.headers.authorization = `Bearer ${token}`;
const headers = new Headers(options && options.headers);
if (token && options && options.headers) {
headers.set('Authorization', `Bearer ${token}`);
options.headers = Object.assign(options.headers, headers);
}

if (!['http://', 'https://', '//'].some(prefix => url.startsWith(prefix))) {
// @ts-ignore
url = window.VERDACCIO_API_URL + url;
}

return new Promise<any>((resolve, reject) => {
return new Promise((resolve, reject) => {
fetch(url, {
method,
credentials: 'same-origin',
Expand Down
4 changes: 2 additions & 2 deletions src/utils/calls.ts
Expand Up @@ -2,8 +2,8 @@ import API from './api';
import { PackageMetaInterface } from 'types/packageMeta';

export interface DetailPage {
readMe: string;
packageMeta: PackageMetaInterface;
readMe: string | {};
packageMeta: PackageMetaInterface | {};
}

export async function callDetailPage(packageName): Promise<DetailPage> {
Expand Down
2 changes: 1 addition & 1 deletion src/utils/file-size.ts
@@ -1,4 +1,4 @@
/* tslint:disable */
/* @ts-ignore */
export default function fileSizeSI(a?: any, b?: any, c?: any, d?: any, e?: any) {
return ((b = Math), (c = b.log), (d = 1e3), (e = (c(a) / c(d)) | 0), a / b.pow(d, e)).toFixed(2) + ' ' + (e ? 'kMGTPEZY'[--e] + 'B' : 'Bytes');
}

0 comments on commit 116055c

Please sign in to comment.