Skip to content

Commit

Permalink
Clean up eslint exceptions
Browse files Browse the repository at this point in the history
  • Loading branch information
folkforms committed Apr 24, 2024
1 parent 4452e08 commit 416aa99
Show file tree
Hide file tree
Showing 15 changed files with 106 additions and 98 deletions.
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
/* eslint-disable no-undef */
/* eslint-disable no-console */
/*
* Copyright Merative US L.P. 2022
*/
/* eslint import/no-unresolved: [2, { ignore: ['devenv_pkg*.'] }] */
// NOTE: from custom-carbon-addons package reference to Renderer would be he following
// import { Renderer } from 'devenv_pkg/src/apollo-client-hooks';
import { Renderer } from 'devenv_pkg/src/apollo-client-hooks';
// eslint-disable-next-line import/no-unresolved
import { Renderer } from "devenv_pkg/src/apollo-client-hooks";

const render = async (containerId, config) => {
Renderer.create(containerId, config, 'LogoComponentApolloClientHook');
Renderer.create(containerId, config, "LogoComponentApolloClientHook");
};

export default render;
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
/* eslint-disable no-undef */
/* eslint-disable no-console */
/*
* Copyright Merative US L.P. 2021, 2022
*/
/* eslint import/no-unresolved: [2, { ignore: ['devenv_pkg*.'] }] */
// NOTE: from custom-carbon-addons package reference to Renderer would be he following
// import { Renderer } from 'devenv_pkg/src/apollo-client-hooks';
import { Renderer } from 'devenv_pkg/src/apollo-client-hooks';
// eslint-disable-next-line import/no-unresolved
import { Renderer } from "devenv_pkg/src/apollo-client-hooks";

const render = async (containerId, config) => {
Renderer.create(containerId, config, 'PersonComponentApolloClientHook');
Renderer.create(containerId, config, "PersonComponentApolloClientHook");
};

export default render;
Original file line number Diff line number Diff line change
@@ -1,27 +1,26 @@
/*
* Copyright Merative US L.P. 2021, 2022
*/
/* eslint import/no-unresolved: [2, { ignore: ['devenv_pkg*.'] }] */
import React from 'react';
import PropTypes from 'prop-types';
// NOTE:
import React from "react";
import PropTypes from "prop-types";
// NOTE:
// from custom-carbon-addons package reference to ApolloClientDataProvider would be he following
// import { ApolloClientDataProvider } from 'devenv_pkg/src/apollo-client-hooks';
import ApolloClientDataProvider from 'devenv_pkg/src/apollo-client-hooks/core/ApolloClientDataProvider';
import LogoQueryProvider from './LogoQueryProvider';

// eslint-disable-next-line import/no-unresolved
import ApolloClientDataProvider from "devenv_pkg/src/apollo-client-hooks/core/ApolloClientDataProvider";
import LogoQueryProvider from "./LogoQueryProvider";

const LogoDataProvider = ({ configuration, apolloClient }) => {
return (
<ApolloClientDataProvider apolloClient={apolloClient} >
<LogoQueryProvider configuration={configuration}/>
<ApolloClientDataProvider apolloClient={apolloClient}>
<LogoQueryProvider configuration={configuration} />
</ApolloClientDataProvider>
);
};

LogoDataProvider.propTypes = {
configuration: PropTypes.object.isRequired,
apolloClient: PropTypes.object.isRequired
}
apolloClient: PropTypes.object.isRequired,
};

export default LogoDataProvider;
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,31 @@
* Copyright Merative US L.P. 2021, 2022
*/

import React from 'react';
import PropTypes from 'prop-types';
/* eslint import/no-unresolved: [2, { ignore: ['devenv_pkg*.'] }] */
import Logo from 'devenv_pkg/src/react/addons_samples/Logo/Logo';
// NOTE:
import React from "react";
import PropTypes from "prop-types";
// eslint-disable-next-line import/no-unresolved
import Logo from "devenv_pkg/src/react/addons_samples/Logo/Logo";
// NOTE:
// from custom-carbon-addons package reference to ApolloClientQueryProvider would be he following
// import { ApolloClientQueryProvider } from 'devenv_pkg/src/apollo-client-hooks';
import ApolloClientQueryProvider from 'devenv_pkg/src/apollo-client-hooks/core/ApolloClientQueryProvider';
import { useGetLogo } from './LogoQuery';
// eslint-disable-next-line import/no-unresolved
import ApolloClientQueryProvider from "devenv_pkg/src/apollo-client-hooks/core/ApolloClientQueryProvider";
import { useGetLogo } from "./LogoQuery";

const LogoQueryProvider = ({ configuration }) => {

const { data } = useGetLogo(configuration.logoId);
const propertyName = 'logo';
const propertyName = "logo";
// dataa in this instance is juts an oject rather than an array
const logo = (<>{data && data[propertyName] && (
<Logo key={data[propertyName].logoId} imageName={data[propertyName].name}/>
)}</>);
const logo = (
<>
{data && data[propertyName] && (
<Logo
key={data[propertyName].logoId}
imageName={data[propertyName].name}
/>
)}
</>
);

if (!data) return <></>;

Expand All @@ -28,7 +35,6 @@ const LogoQueryProvider = ({ configuration }) => {
{logo}
</ApolloClientQueryProvider>
);

};

LogoQueryProvider.propTypes = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
* Copyright Merative US L.P. 2020, 2022
*/

/* eslint import/no-unresolved: [2, { ignore: ['devenv_pkg*.'] }] */
import { ApolloClientHookTemplate } from 'devenv_pkg/src/apollo-client-hooks';
import LogoDataProvider from './LogoDataProvider';
// eslint-disable-next-line import/no-unresolved
import { ApolloClientHookTemplate } from "devenv_pkg/src/apollo-client-hooks";
import LogoDataProvider from "./LogoDataProvider";

const LogoComponentApolloClientHook = (container, configuration) => {
ApolloClientHookTemplate(container, configuration, LogoDataProvider);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
/*
* Copyright Merative US L.P. 2021, 2022
*/
/* eslint import/no-unresolved: [2, { ignore: ['devenv_pkg*.'] }] */
import React from 'react';
import PropTypes from 'prop-types';
// NOTE:
import React from "react";
import PropTypes from "prop-types";
// NOTE:
// from custom-carbon-addons package reference to ApolloClientDataProvider would be he following
// import { ApolloClientDataProvider } from 'devenv_pkg/src/apollo-client-hooks';
import ApolloClientDataProvider from 'devenv_pkg/src/apollo-client-hooks/core/ApolloClientDataProvider';
import PersonFolioQueryProvider from './PersonFolioQueryProvider';
// eslint-disable-next-line import/no-unresolved
import ApolloClientDataProvider from "devenv_pkg/src/apollo-client-hooks/core/ApolloClientDataProvider";
import PersonFolioQueryProvider from "./PersonFolioQueryProvider";

const PersonDataProvider = ({ configuration, apolloClient }) => {
return (
<ApolloClientDataProvider apolloClient={apolloClient} >
<PersonFolioQueryProvider configuration={configuration}/>
<ApolloClientDataProvider apolloClient={apolloClient}>
<PersonFolioQueryProvider configuration={configuration} />
</ApolloClientDataProvider>
);
};

PersonDataProvider.propTypes = {
configuration: PropTypes.object.isRequired,
apolloClient: PropTypes.object.isRequired
}
apolloClient: PropTypes.object.isRequired,
};

export default PersonDataProvider;
Original file line number Diff line number Diff line change
@@ -1,23 +1,34 @@
/*
* Copyright Merative US L.P. 2021, 2022
*/
/* eslint import/no-unresolved: [2, { ignore: ['devenv_pkg*.'] }] */
import React from 'react';
import PropTypes from 'prop-types';
// NOTE:
import React from "react";
import PropTypes from "prop-types";
// NOTE:
// from custom-carbon-addons package reference to ApolloClientQueryProvider would be he following
// import { ApolloClientQueryProvider } from 'devenv_pkg/src/apollo-client-hooks';
import ApolloClientQueryProvider from 'devenv_pkg/src/apollo-client-hooks/core/ApolloClientQueryProvider';
import PersonFolio from 'devenv_pkg/src/react/addons_samples/PersonFolio/PersonFolio';
import { useGetPersons } from './PersonQuery';
// eslint-disable-next-line import/no-unresolved
import ApolloClientQueryProvider from "devenv_pkg/src/apollo-client-hooks/core/ApolloClientQueryProvider";
// eslint-disable-next-line import/no-unresolved
import PersonFolio from "devenv_pkg/src/react/addons_samples/PersonFolio/PersonFolio";
import { useGetPersons } from "./PersonQuery";

const PersonFolioQueryProvider = ({ configuration }) => {
const propertyName = 'persons';
const propertyName = "persons";
const { data } = useGetPersons();
// 'persons' from graphql query is an array so return as list
const personToRender = (<>{data && data[propertyName].map(person => (
<PersonFolio key={person.id} firstname={person.firstname} surname={person.surname} age={person.age}/>
))}</>);
const personToRender = (
<>
{data &&
data[propertyName].map((person) => (
<PersonFolio
key={person.id}
firstname={person.firstname}
surname={person.surname}
age={person.age}
/>
))}
</>
);

if (!data) return <></>;

Expand All @@ -26,7 +37,6 @@ const PersonFolioQueryProvider = ({ configuration }) => {
{personToRender}
</ApolloClientQueryProvider>
);

};

PersonFolioQueryProvider.propTypes = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/*
* Copyright Merative US L.P. 2021, 2022
*/
/* eslint import/no-unresolved: [2, { ignore: ['devenv_pkg*.'] }] */
import { ApolloClientHookTemplate } from 'devenv_pkg/src/apollo-client-hooks';
import PersonDataProvider from './PersonDataProvider';
// eslint-disable-next-line import/no-unresolved
import { ApolloClientHookTemplate } from "devenv_pkg/src/apollo-client-hooks";
import PersonDataProvider from "./PersonDataProvider";

const PersonComponentApolloClientHook = (container, config) => {
ApolloClientHookTemplate(container, config, PersonDataProvider);
}
};

export default PersonComponentApolloClientHook;
21 changes: 10 additions & 11 deletions packages/carbon-addons-devenv/src/dynamicExports.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@

/*
Use when the main bundle is not on the same level as the script calling it.
Webpack will reference this path when emitting the chunks
*/
export const usePublicPath = async (path) => {
if (path) {
__webpack_public_path__ = path; // eslint-disable-line
}
};

if (path) {
// eslint-disable-next-line camelcase, no-undef
__webpack_public_path__ = path;
}
};

/* Imports Carbon Addons dynamically */
export const requireCustomCarbonAddons = async () => {
const customCarbonAddons = await import(
/* webpackChunkName: "simple" */ '../../custom-carbon-addons/src/apollo-client-hooks'
);
return customCarbonAddons;
};
const customCarbonAddons = await import(
/* webpackChunkName: "simple" */ "../../custom-carbon-addons/src/apollo-client-hooks"
);
return customCarbonAddons;
};
5 changes: 2 additions & 3 deletions packages/carbon-addons-devenv/src/staticExports.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,5 @@
*
* These are commonly used imports that should be part of the main bundle.
*/
// eslint-disable-next-line import/prefer-default-export
export { default as sampleRenderers } from '../sample_renderers';
export { default as renderers } from '../../custom-carbon-addons/renderers';
export { default as sampleRenderers } from "../sample_renderers";
export { default as renderers } from "../../custom-carbon-addons/renderers";
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* eslint-disable import/prefer-default-export */
/*
* Copyright Merative US L.P. 2022
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* eslint-disable import/prefer-default-export */
/*
* Copyright Merative US L.P. 2022
*/
Expand Down
11 changes: 7 additions & 4 deletions packages/custom-carbon-addons/src/apollo-client-hooks/index.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
/*
* Copyright Merative US L.P. 2021
*/
/* eslint import/no-unresolved: [2, { ignore: ['devenv_pkg*.'] }] */
import { ApolloClientHooks } from 'devenv_pkg/src/apollo-client-hooks';
import * as CustomApolloClientHooks from './hooks/components';
// eslint-disable-next-line import/no-unresolved
import { ApolloClientHooks } from "devenv_pkg/src/apollo-client-hooks";
import * as CustomApolloClientHooks from "./hooks/components";

// ApolloClientHooks object initially has the list of sample components to be renderered
// The custom appollo client hooks are automatically added to the sample ones below
// INSTRUCTIONS: Add custom ones to components/index.js (and/or feature/index.js)

const updatedApolloClientHooks = { ...ApolloClientHooks, ...CustomApolloClientHooks };
const updatedApolloClientHooks = {
...ApolloClientHooks,
...CustomApolloClientHooks,
};

// eslint-disable-next-line import/prefer-default-export
export { updatedApolloClientHooks as ApolloClientHooks };
17 changes: 8 additions & 9 deletions packages/custom-carbon-addons/src/index.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
/*
* Copyright Merative US L.P. 2021
*/

/* eslint import/no-unresolved: [2, { ignore: ['devenv_pkg*.'] }] */
import { renderers, sampleRenderers } from 'devenv_pkg/src';

// eslint-disable-next-line import/prefer-default-export
export { renderers, sampleRenderers };
/*
* Copyright Merative US L.P. 2021
*/

// eslint-disable-next-line import/no-unresolved
import { renderers, sampleRenderers } from "devenv_pkg/src";

export { renderers, sampleRenderers };
11 changes: 5 additions & 6 deletions public-path.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@


// Path to SPMUIComponents directory (relative to WebContent folder).
const spmUIComponentsBaseURL = process.env.RELATIVE_PATH_TO_BUNDLE;
const spmUIComponentsBaseURL = process.env.RELATIVE_PATH_TO_BUNDLE;

// Retrieves Static Content Server from SPM.
//
// The serverRootURL is set on the root document window so if a js bundle
// is requested by a UIM iframe the parent window is checked instead.
const serverRootURL =
window.curam || window.parent.curam
? window.curam.serverRootURL || window.parent.curam.serverRootURL || ''
: '';
? window.curam.serverRootURL || window.parent.curam.serverRootURL || ""
: "";

// If a Static Content Server URL is not set, '../' must be prepended to
// the URL to get the correct relative path.
Expand All @@ -21,4 +19,5 @@ const spmUIComponentsRootURL = serverRootURL
// Concatenate the correct public path for use in webpack bundles.
const publicPath = `${serverRootURL}${spmUIComponentsRootURL}`;

export default __webpack_public_path__ = publicPath; // eslint-disable-line
// eslint-disable-next-line camelcase, no-undef
export default __webpack_public_path__ = publicPath;

0 comments on commit 416aa99

Please sign in to comment.