Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

O3-1468: Update the components with Carbon v11 changes #8

Merged
merged 1 commit into from Aug 18, 2022
Merged

O3-1468: Update the components with Carbon v11 changes #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Expand Up @@ -23,7 +23,7 @@
"@carbon/colors": "^11.2.0",
"@carbon/react": "^1.8.0",
"@jsenv/file-size-impact": "^12.1.1",
"@openmrs/esm-framework": "^4.0.0-pre.1",
"@openmrs/esm-framework": "next",
"@swc/cli": "^0.1.57",
"@swc/core": "^1.2.205",
"@swc/jest": "^0.2.21",
Expand Down Expand Up @@ -52,7 +52,7 @@
"jest": "^28.1.0",
"jest-cli": "^28.1.0",
"lerna": "^3.20.2",
"openmrs": "^4.0.0-pre.1",
"openmrs": "next",
"prettier": "^2.4.1",
"pretty-quick": "^2.0.2",
"react": "^18.1.0",
Expand All @@ -63,8 +63,8 @@
"sass": "^1.29.0",
"sass-loader": "^10.1.0",
"swc-loader": "^0.2.3",
"typescript": "^4.0.3",
"turbo": "^1.2.2",
"typescript": "^4.0.3",
"webpack": "^5.36.2",
"webpack-cli": "^4.7.0"
},
Expand Down
15 changes: 5 additions & 10 deletions packages/esm-admin-openconceptlab-app/src/import/import.component.scss
View file
Open in desktop
Expand Up @@ -2,16 +2,11 @@
@use "@carbon/styles/scss/type";
@import "~@openmrs/esm-styleguide/src/vars";

.tabContentContainer {
height: 100%;
background-color: $ui-01;
padding-left: spacing.$spacing-07;
padding-right: spacing.$spacing-07;
padding-top: spacing.$spacing-05;
padding-bottom: spacing.$spacing-07;
margin-left: -1 * spacing.$spacing-07;
margin-top: -1 * spacing.$spacing-05;
margin-right: -1 * spacing.$spacing-05;
.grid {
margin-left: 0;
margin-right: 0;
padding-left: 0;
padding-right: 0;
}

.productiveHeading03 {
Expand Down
14 changes: 7 additions & 7 deletions packages/esm-admin-openconceptlab-app/src/import/import.component.tsx
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@ import {
FileUploaderItem,
FileUploaderSkeleton,
Form,
Row,
Grid,
SkeletonText,
} from '@carbon/react';
import React, { useCallback, useEffect, useState } from 'react';
Expand Down Expand Up @@ -112,8 +112,8 @@ const Import: React.FC = () => {

if (isLoading) {
return (
<Row className={styles.tabContentContainer}>
<Column sm={12} lg={7}>
<Grid className={styles.grid}>
<Column sm={4} md={8} lg={10}>
<Form>
<SkeletonText className={styles.productiveHeading03} heading={true} />
<SkeletonText className={styles.formText} paragraph={true} lineCount={2} />
Expand All @@ -127,7 +127,7 @@ const Import: React.FC = () => {
<ButtonSkeleton />
</Form>
</Column>
</Row>
</Grid>
);
}

Expand All @@ -139,8 +139,8 @@ const Import: React.FC = () => {
}

return (
<Row className={styles.tabContentContainer}>
<Column sm={12} lg={7}>
<Grid className={styles.grid}>
<Column sm={4} md={8} lg={10}>
<Form onSubmit={handleImportWithSubscription}>
<h3 className={styles.productiveHeading03}>{t('importConcepts')}</h3>
<p className={styles.formText}>{t('importInstructions')}</p>
Expand Down Expand Up @@ -176,7 +176,7 @@ const Import: React.FC = () => {
</Button>
</Form>
</Column>
</Row>
</Grid>
);
};

Expand Down
9 changes: 7 additions & 2 deletions packages/esm-admin-openconceptlab-app/src/root.component.scss
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@
@import "~@openmrs/esm-styleguide/src/vars";

.main {
background-color: $ui-02
background-color: $ui-02;
}

.moduleHeader {
Expand All @@ -13,6 +13,11 @@
padding-bottom: spacing.$spacing-05;
}

.tabs {
.tabList {
padding: 0 spacing.$spacing-05;
}

.tabPanel {
height: 100%;
background-color: $ui-01;
}
25 changes: 16 additions & 9 deletions packages/esm-admin-openconceptlab-app/src/root.component.tsx
View file
Open in desktop
@@ -1,4 +1,4 @@
import { Tab, Tabs } from '@carbon/react';
import { Tab, Tabs, TabList, TabPanels, TabPanel } from '@carbon/react';
import React from 'react';
import { useTranslation } from 'react-i18next';
import { BrowserRouter } from 'react-router-dom';
Expand All @@ -14,14 +14,21 @@ const Root: React.FC = () => {
<main className={`omrs-main-content ${styles.main}`}>
<h3 className={styles.moduleHeader}>{t('moduleTitle')}</h3>
<BrowserRouter basename={`${window.getOpenmrsSpaBase()}ocl`}>
<Tabs className={styles.tabs} type="container">
<Tab label={t('subscription')}>
<Subscription />
</Tab>
<Tab label={t('import')}>
<Import />
</Tab>
<Tab label={t('previousImports')} />
<Tabs>
<TabList className={styles.tabList} contained={true}>
<Tab>{t('subscription')} </Tab>
<Tab>{t('import')} </Tab>
<Tab>{t('previousImports')} </Tab>
</TabList>
<TabPanels>
<TabPanel className={styles.tabPanel}>
<Subscription />
</TabPanel>
<TabPanel className={styles.tabPanel}>
<Import />
</TabPanel>
<TabPanel className={styles.tabPanel} />
</TabPanels>
</Tabs>
</BrowserRouter>
</main>
Expand Down
19 changes: 5 additions & 14 deletions packages/esm-admin-openconceptlab-app/src/subscription/subscription.component.scss
View file
Open in desktop
Expand Up @@ -2,27 +2,18 @@
@use "@carbon/styles/scss/type";
@import "~@openmrs/esm-styleguide/src/vars";

.tabContentContainer {
height: 100%;
padding-left: spacing.$spacing-07;
padding-right: spacing.$spacing-07;
padding-top: spacing.$spacing-05;
padding-bottom: spacing.$spacing-07;
background-color: $ui-01;
margin-left: -1 * spacing.$spacing-07;
margin-top: -1 * spacing.$spacing-05;
margin-right: -1 * spacing.$spacing-05;
.grid {
margin-left: 0;
margin-right: 0;
padding-left: 0;
padding-right: 0;
}

.productiveHeading03 {
@include type.type-style('productive-heading-03');
margin-bottom: spacing.$spacing-03;
}

.input {
margin-bottom: spacing.$spacing-05;
}

.formGroup {
margin-bottom: spacing.$spacing-05;
}
Expand Down
97 changes: 50 additions & 47 deletions packages/esm-admin-openconceptlab-app/src/subscription/subscription.component.tsx
View file
Open in desktop
Expand Up @@ -7,7 +7,8 @@ import {
Column,
Form,
FormGroup,
Row,
Grid,
Stack,
SkeletonText,
TextInput,
TextInputSkeleton,
Expand Down Expand Up @@ -137,16 +138,18 @@ const Subscription: React.FC = () => {

if (isLoading) {
return (
<Row className={styles.tabContentContainer}>
<Column sm={12} lg={7}>
<Grid className={styles.grid}>
<Column sm={4} md={8} lg={10}>
<Form>
<SkeletonText className={styles.productiveHeading03} />
<TextInputSkeleton className={styles.input} />
<TextInputSkeleton className={styles.input} />
<FormGroup legendText={<SkeletonText width="75px" />} className={styles.formGroup}>
<CheckboxSkeleton />
<CheckboxSkeleton />
</FormGroup>
<Stack gap={5}>
<TextInputSkeleton />
<TextInputSkeleton />
<FormGroup legendText={<SkeletonText width="75px" />} className={styles.formGroup}>
<CheckboxSkeleton />
<CheckboxSkeleton />
</FormGroup>
</Stack>
<ButtonSkeleton />
<ButtonSkeleton />
</Form>
Expand All @@ -156,51 +159,51 @@ const Subscription: React.FC = () => {
<ButtonSkeleton />
</Form>
</Column>
</Row>
</Grid>
);
}

return (
<Row className={styles.tabContentContainer}>
<Column sm={12} lg={7}>
<Grid className={styles.grid}>
<Column sm={4} md={8} lg={10}>
<Form onSubmit={handleSubmit}>
<h3 className={styles.productiveHeading03}>{t('setupSubscription')}</h3>
<TextInput
className={styles.input}
id="subscriptionUrl"
type="url"
labelText={t('subscriptionUrl')}
placeholder="https://api.openconceptlab.org/orgs/organization-name/collections/dictionary-name"
value={subscriptionUrl}
onChange={handleChangeSubscriptionUrl}
light={true}
required
/>
<TextInput
className={styles.input}
id="apiToken"
type="password"
placeholder="••••••••••••••••••••••••••••••••••••••••••••••••"
labelText={t('apiToken')}
value={token}
onChange={handleChangeToken}
light={true}
required
/>
<FormGroup legendText={t('advancedOptions')} className={styles.formGroup}>
<Checkbox
checked={isSubscribedToSnapshot}
onChange={handleChangeSubscriptionType}
labelText={t('subscribeToSnapshotText')}
id="isSubscribedToSnapshot"
<Stack gap={5}>
<TextInput
id="subscriptionUrl"
type="url"
labelText={t('subscriptionUrl')}
placeholder="https://api.openconceptlab.org/orgs/organization-name/collections/dictionary-name"
value={subscriptionUrl}
onChange={handleChangeSubscriptionUrl}
light={true}
required
/>
<Checkbox
checked={validationType === 'NONE'}
onChange={handleChangeValidationType}
labelText={t('disableValidationText')}
id="isValidationDisabled"
<TextInput
id="apiToken"
type="password"
placeholder="••••••••••••••••••••••••••••••••••••••••••••••••"
labelText={t('apiToken')}
value={token}
onChange={handleChangeToken}
light={true}
required
/>
</FormGroup>
<FormGroup legendText={t('advancedOptions')} className={styles.formGroup}>
<Checkbox
checked={isSubscribedToSnapshot}
onChange={handleChangeSubscriptionType}
labelText={t('subscribeToSnapshotText')}
id="isSubscribedToSnapshot"
/>
<Checkbox
checked={validationType === 'NONE'}
onChange={handleChangeValidationType}
labelText={t('disableValidationText')}
id="isValidationDisabled"
/>
</FormGroup>
</Stack>
<Button kind="secondary" onClick={handleCancel}>
{t('cancelButton')}
</Button>
Expand All @@ -216,7 +219,7 @@ const Subscription: React.FC = () => {
</Button>
</Form>
</Column>
</Row>
</Grid>
);
};

Expand Down