Skip to content

Commit

Permalink
🎨 UI changes for 5.3.0 (#1699)
Browse files Browse the repository at this point in the history
* Footer changed and removed contianer class override

* Font awsome broken icons fixed (#1668)

* fontawsome upgrade 4.7.0 to 6.4.2

* updated icon break

---------

Co-authored-by: shuhaib-aot <[email protected]>

* Designer form (#1683)

* designer table change

* backend changes for new design

* buttons for create upload and download

* delete view functions

* application table added

* application and draft changes

* draft delete issue fixed

* Changes/design 5.3.0 (#1678)

* Adding common error handler

Adding common error handler

* Update __init__.py

* Update startup.py

* Update conftest.py

* Update requirements.txt

* Fixing PR comments

* Update requirements.txt

* Update requirements.txt

* Requirements update

* vulnerability fix (#1652)

* Update application.yaml (#1657)

* keycloak register css fix (#1656)

* Keycloak registration page alignment issue fixed

* Code formatted

* css updated

* serviceflow button's alignment (#1654)

* Fwf 2702/delete confirmation modal change (#1659)

* Updated cancel button on delete modal

* typo fixed

* Created custom stepper component (#1660)

* Webapi component changes for ELK support (#1655)

* submission  name updated (#1662)

* submission  name updated

* updated codes

* removed duplication

* preview updated

* updated process tab (#1663)

* updated process tab

* updated test

* removed unwanted redux state

---------

Co-authored-by: shuhaib s <[email protected]>

* Requirements file updated to switch to develop (#1667)

The reference in the requirements file has been updated to switch from the feature branch to the 'develop' branch.

* dropdown fixed (#1670)

* Exposed camunda process definition and decision definition count endpoints (#1669)

* Expose camunda  endpoints

Expose camunda process definition and decision definition count endpoints

* Update index.js

* Cancel button modal changes (#1675)

* Process digaram fetching issue fixed (#1676)

---------

Co-authored-by: Sumesh Kariyil <[email protected]>
Co-authored-by: Abil P Raju <[email protected]>
Co-authored-by: Sneha Suresh <[email protected]>
Co-authored-by: Bonymol Baby <[email protected]>
Co-authored-by: Alex Antony <[email protected]>
Co-authored-by: auslin-aot <[email protected]>

* pagination and limit issues solved for draft

* Fixed fetchAllprocess list function breaking and give proper title to back button (#1679)

* updated title (#1671)

* new ui for form creation and edit (#1680)

* new ui for form creation and edit

* clg removed

* cleanup

* cleanup 2

---------

Co-authored-by: AbijithS-aot <[email protected]>
Co-authored-by: Sumesh Kariyil <[email protected]>
Co-authored-by: Abil P Raju <[email protected]>
Co-authored-by: Sneha Suresh <[email protected]>
Co-authored-by: Bonymol Baby <[email protected]>
Co-authored-by: Alex Antony <[email protected]>
Co-authored-by: auslin-aot <[email protected]>
Co-authored-by: Ajay-aot <[email protected]>

* error fixed

* cleanup all window

* Added description to form_process_mapper table (#1684)

* dashboard fix

* publised un published button fix

* Design fixes Dashboard and form table (#1685)

* dashboard fix

* publised un published button fix

* New UI refresh fixes (#1686)

* New UI refresh fixes

* submission and draft heading updated

* Internationalisation changes (#1691)

* internationalisation changes

* updated

* UI changes  (#1697)

* clientList UI changes

* ClientTable update

* Fixed submit button and unpublished message and dashboard

* ui changes

---------

Co-authored-by: Bonymol-aot <[email protected]>

* process table changed

* fixed test for formdescription

* updated help button in process window

* testcase update

* Update list.test.js

---------

Co-authored-by: Abijith Sebastian <[email protected]>
Co-authored-by: Abil P Raju <[email protected]>
Co-authored-by: AbijithS-aot <[email protected]>
Co-authored-by: Sumesh Kariyil <[email protected]>
Co-authored-by: Sneha Suresh <[email protected]>
Co-authored-by: Bonymol Baby <[email protected]>
Co-authored-by: Alex Antony <[email protected]>
Co-authored-by: auslin-aot <[email protected]>
Co-authored-by: Ajay-aot <[email protected]>
Co-authored-by: fahad-aot <[email protected]>
Co-authored-by: Bonymol-aot <[email protected]>
  • Loading branch information
12 people authored Nov 9, 2023
1 parent 237c58c commit 2beed8c
Show file tree
Hide file tree
Showing 91 changed files with 3,354 additions and 27,769 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
"""Added form description
Revision ID: 537aa072d731
Revises: 1b4fa1bb6449
Create Date: 2023-11-06 15:25:15.629148
"""
from alembic import op
import sqlalchemy as sa
from sqlalchemy.dialects import postgresql

# revision identifiers, used by Alembic.
revision = '537aa072d731'
down_revision = '1b4fa1bb6449'
branch_labels = None
depends_on = None


def upgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.add_column('form_process_mapper', sa.Column('description', sa.String(), nullable=True))
# ### end Alembic commands ###


def downgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.drop_column('form_process_mapper', 'description')
# ### end Alembic commands ###
21 changes: 19 additions & 2 deletions forms-flow-api/src/formsflow_api/models/form_process_mapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ class FormProcessMapper(AuditDateTimeMixin, AuditUserMixin, BaseModel, db.Model)
deleted = db.Column(db.Boolean, nullable=True, default=False)
task_variable = db.Column(JSON, nullable=True)
version = db.Column(db.Integer, nullable=False, default=1)
description = db.Column(db.String, nullable=True)

__table_args__ = (
UniqueConstraint("form_id", "version", "tenant", name="_form_version_uc"),
Expand All @@ -76,6 +77,7 @@ def create_from_dict(cls, mapper_info: dict) -> FormProcessMapper:
mapper.is_anonymous = mapper_info.get("is_anonymous")
mapper.task_variable = mapper_info.get("task_variable")
mapper.version = mapper_info.get("version")
mapper.description = mapper_info.get("description")
mapper.save()
return mapper
except Exception as err: # pylint: disable=broad-except
Expand All @@ -102,6 +104,7 @@ def update(self, mapper_info: dict):
"is_anonymous",
"task_variable",
"process_tenant",
"description",
],
mapper_info,
)
Expand Down Expand Up @@ -213,7 +216,16 @@ def find_all_forms(

total_count = query.count()
query = query.with_entities(
cls.id, cls.process_key, cls.form_id, cls.form_name, cls.modified
cls.id,
cls.process_key,
cls.form_id,
cls.form_name,
cls.modified,
cls.status,
cls.is_anonymous,
cls.form_type,
cls.created,
cls.description,
)
limit = total_count if limit is None else limit
query = query.paginate(page=page_number, per_page=limit, error_out=False)
Expand Down Expand Up @@ -246,7 +258,12 @@ def find_all_active_by_formid(

total_count = query.count()
query = query.with_entities(
cls.id, cls.process_key, cls.form_id, cls.form_name, cls.modified
cls.id,
cls.process_key,
cls.form_id,
cls.form_name,
cls.modified,
cls.description,
)
limit = total_count if limit is None else limit
query = query.paginate(page=page_number, per_page=limit, error_out=False)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ class Meta: # pylint: disable=too-few-public-methods
version = fields.Str(data_key="version")
process_tenant = fields.Str(data_key="processTenant")
deleted = fields.Boolean(data_key="deleted")
description = fields.Str(data_key="description")


class FormProcessMapperListReqSchema(Schema):
Expand Down

This file was deleted.

This file was deleted.

99 changes: 0 additions & 99 deletions forms-flow-idm/keycloak/themes/formsflow/login/login.ftl

This file was deleted.

Loading

0 comments on commit 2beed8c

Please sign in to comment.